Browse Source

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>
Heiko Carstens 13 years ago
parent
commit
d652d59682
2 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/s390/include/asm/timex.h
  2. 1 1
      arch/s390/kernel/entry64.S

+ 1 - 1
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");

+ 1 - 1
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