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>

diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
index 72eaa8511a4f4b68dc532ba6b109c4cb9dc40b17..239ece9e53c133f182a810cb731688a268e3fdaa 100644 (file)
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@ -77,7 +77,7 @@ static inline unsigned long long get_clock(void)
 {
        unsigned long long clk;
 
-#if defined(CONFIG_64BIT) && !defined(CONFIG_MARCH_Z900) && !defined(CONFIG_MARCH_Z990)
+#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
        asm volatile(".insn s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
 #else
        asm volatile("stck %0" : "=Q" (clk) : : "cc");

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 02b660a7dcd4317c84dbfac161ad197f973d21c2..02bf601d84bf2390a9b44b8243952b7f10e0ebcb 100644 (file)
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -147,7 +147,7 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
        .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