summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/percpu.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2016-06-08 21:38:43 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2016-06-08 21:41:20 +0200
commit64be6d36f5674f3424d1901772f76e21874f4954 (patch)
treec339aa9602e675b429dfadd773ac730228584758 /arch/x86/include/asm/percpu.h
parentx86, asm: Use CC_SET()/CC_OUT() in <asm/bitops.h> (diff)
downloadlinux-64be6d36f5674f3424d1901772f76e21874f4954.tar.xz
linux-64be6d36f5674f3424d1901772f76e21874f4954.zip
x86, asm: Use CC_SET()/CC_OUT() in <asm/percpu.h>
Remove open-coded uses of set instructions to use CC_SET()/CC_OUT() in <asm/percpu.h>. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Link: http://lkml.kernel.org/r/1465414726-197858-8-git-send-email-hpa@linux.intel.com Reviewed-by: Andy Lutomirski <luto@kernel.org> Reviewed-by: Borislav Petkov <bp@suse.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to 'arch/x86/include/asm/percpu.h')
-rw-r--r--arch/x86/include/asm/percpu.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 184d7f3ecb9f..e02e3f80d363 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -511,8 +511,9 @@ do { \
#define x86_test_and_clear_bit_percpu(bit, var) \
({ \
bool old__; \
- asm volatile("btr %2,"__percpu_arg(1)"\n\tsetc %0" \
- : "=qm" (old__), "+m" (var) \
+ asm volatile("btr %2,"__percpu_arg(1)"\n\t" \
+ CC_SET(c) \
+ : CC_OUT(c) (old__), "+m" (var) \
: "dIr" (bit)); \
old__; \
})
@@ -535,8 +536,8 @@ static inline bool x86_this_cpu_variable_test_bit(int nr,
bool oldbit;
asm volatile("bt "__percpu_arg(2)",%1\n\t"
- "setc %0"
- : "=qm" (oldbit)
+ CC_SET(c)
+ : CC_OUT(c) (oldbit)
: "m" (*(unsigned long *)addr), "Ir" (nr));
return oldbit;