Commit-ID:  ad5bf6a52b7fac127d126434fdf950e7bd6f7554
Gitweb:     http://git.kernel.org/tip/ad5bf6a52b7fac127d126434fdf950e7bd6f7554
Author:     H. Peter Anvin <h...@zytor.com>
AuthorDate: Tue, 7 Jun 2016 16:31:06 -0700
Committer:  H. Peter Anvin <h...@linux.intel.com>
CommitDate: Tue, 7 Jun 2016 16:36:42 -0700

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 <h...@zytor.com>
Link: 
http://lkml.kernel.org/r/1465342269-492350-8-git-send-email-...@linux.intel.com
---
 arch/x86/include/asm/percpu.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 184d7f3..e02e3f8 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;

Reply via email to