From: "H. Peter Anvin" <h...@zytor.com>
Remove open-coded uses of set instructions to use CC_SET()/CC_OUT() in
<asm/bitops.h>.
Signed-off-by: H. Peter Anvin <h...@zytor.com>
---
arch/x86/include/asm/bitops.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index ed8f485..68557f52 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -233,8 +233,8 @@ static __always_inline bool __test_and_set_bit(long nr,
volatile unsigned long *
bool oldbit;
asm("bts %2,%1\n\t"
- "setc %0"
- : "=qm" (oldbit), ADDR
+ CC_SET(c)
+ : CC_OUT(c) (oldbit), ADDR
: "Ir" (nr));
return oldbit;
}
@@ -273,8 +273,8 @@ static __always_inline bool __test_and_clear_bit(long nr,
volatile unsigned long
bool oldbit;
asm volatile("btr %2,%1\n\t"
- "setc %0"
- : "=qm" (oldbit), ADDR
+ CC_SET(c)
+ : CC_OUT(c) (oldbit), ADDR
: "Ir" (nr));
return oldbit;
}
@@ -285,8 +285,8 @@ static __always_inline bool __test_and_change_bit(long nr,
volatile unsigned lon
bool oldbit;
asm volatile("btc %2,%1\n\t"
- "setc %0"
- : "=qm" (oldbit), ADDR
+ CC_SET(c)
+ : CC_OUT(c) (oldbit), ADDR
: "Ir" (nr) : "memory");
return oldbit;
@@ -316,8 +316,8 @@ static __always_inline bool variable_test_bit(long nr,
volatile const unsigned l
bool oldbit;
asm volatile("bt %2,%1\n\t"
- "setc %0"
- : "=qm" (oldbit)
+ CC_SET(c)
+ : CC_OUT(c) (oldbit)
: "m" (*(unsigned long *)addr), "Ir" (nr));
return oldbit;
--
2.7.3.0.11.gd79db92
