Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[cascardo/linux.git] / arch / x86 / include / asm / percpu.h

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