commit d652d59682c8891bdaecfccc72b0209cbe91d89f
author Heiko Carstens <heiko.carstens@de.ibm.com> Mon May 14 10:35:22 2012 +0200
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Wed May 16 14:42:44 2012 +0200
tree f04f1d0d174bab1b28496f3666d9d4dc597fcd36
parent 0544516956c0b949e3190f744df4b473f5ad4853

s390/time: simply Kconfig dependency

Use HAVE_MARCH_Z9_109_FEATURES to figure out if stckf is available
at compile time.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

arch/s390/kernel/entry64.S

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 02b660a..02bf601 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -147,7 +147,7 @@
 	.endm
 
 	.macro STCK savearea
-#if defined(CONFIG_64BIT) && !defined(CONFIG_MARCH_Z900) && !defined(CONFIG_MARCH_Z990)
+#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
 	.insn	s,0xb27c0000,\savearea		# store clock fast
 #else
 	.insn	s,0xb2050000,\savearea		# store clock