Skip to contentSkip to conversation

x86, asm: Use CC_SET()/CC_OUT() for __cmpxchg_double

PATCH Superseded Uros Bizjak 1 participant 1 message Aug 20, 2018 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, asm: Use CC_SET()/CC_OUT() for __cmpxchg_double

Remove open-coded uses of set instructions to use CC_SET()/CC_OUT() for __cmpxchg_double.

---
 arch/x86/include/asm/cmpxchg.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/x86/include/asm/cmpxchg.h +6 -4
index a55d79b233d3..bfb85e5844ab 100644
@@ -242,10 +242,12 @@ extern void __add_wrong_size(void)
 	BUILD_BUG_ON(sizeof(*(p2)) != sizeof(long));			\
 	VM_BUG_ON((unsigned long)(p1) % (2 * sizeof(long)));		\
 	VM_BUG_ON((unsigned long)((p1) + 1) != (unsigned long)(p2));	\
-	asm volatile(pfx "cmpxchg%c4b %2; sete %0"			\
-		     : "=a" (__ret), "+d" (__old2),			\
-		       "+m" (*(p1)), "+m" (*(p2))			\
-		     : "i" (2 * sizeof(long)), "a" (__old1),		\
+	asm volatile(pfx "cmpxchg%c5b %1"				\
+		     CC_SET(e)						\
+		     : CC_OUT(e) (__ret),				\
+		       "+m" (*(p1)), "+m" (*(p2)),			\
+		       "+a" (__old1), "+d" (__old2)			\
+		     : "i" (2 * sizeof(long)),				\
 		       "b" (__new1), "c" (__new2));			\
 	__ret;								\
 })
Signature · 1 line
2.17.1