kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

s390/time: simply Kconfig dependency

Browse source 
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>
This commit is contained in:
Heiko Carstens 2012-05-14 10:35:22 +02:00 committed by Martin Schwidefsky
parent 0544516956
commit d652d59682
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/s390/include/asm/timex.h
View file

@ -77,7 +77,7 @@ static inline unsigned long long get_clock(void)
{ {
unsigned long long clk; 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"); asm volatile(".insn s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
#else #else
asm volatile("stck %0" : "=Q" (clk) : : "cc"); asm volatile("stck %0" : "=Q" (clk) : : "cc");

2
arch/s390/kernel/entry64.S
View file

@ -147,7 +147,7 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
.endm .endm
.macro STCK savearea .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 .insn s,0xb27c0000,\savearea # store clock fast
#else #else
.insn s,0xb2050000,\savearea # store clock .insn s,0xb2050000,\savearea # store clock