diff options
| author | Heiko Carstens | 2012-05-14 10:35:22 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2012-05-16 14:42:44 +0200 |
| commit | d652d59682c8891bdaecfccc72b0209cbe91d89f (patch) | |
| tree | f04f1d0d174bab1b28496f3666d9d4dc597fcd36 /arch/s390 | |
| parent | s390/Kconfig: add HAVE_MARCH_[ARCH]_FEATURES Kconfig symbols (diff) | |
| download | kernel-qcow2-linux-d652d59682c8891bdaecfccc72b0209cbe91d89f.tar.gz kernel-qcow2-linux-d652d59682c8891bdaecfccc72b0209cbe91d89f.tar.xz kernel-qcow2-linux-d652d59682c8891bdaecfccc72b0209cbe91d89f.zip | |
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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/timex.h | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/entry64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h index 72eaa8511a4f..239ece9e53c1 100644 --- 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 02b660a7dcd4..02bf601d84bf 100644 --- 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 |