summaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-05-14 10:35:22 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-05-16 14:42:44 +0200
commitd652d59682c8891bdaecfccc72b0209cbe91d89f (patch)
treef04f1d0d174bab1b28496f3666d9d4dc597fcd36 /arch/s390/include
parent0544516956c0b949e3190f744df4b473f5ad4853 (diff)
downloadblackbird-op-linux-d652d59682c8891bdaecfccc72b0209cbe91d89f.tar.gz
blackbird-op-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/include')
-rw-r--r--arch/s390/include/asm/timex.h2
1 files changed, 1 insertions, 1 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");
OpenPOWER on IntegriCloud