Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1417809

[PATCH v2 06/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/bitops.h>

From "H. Peter Anvin" <hpa@linux.intel.com>
Newsgroups linux.kernel
Subject [PATCH v2 06/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/bitops.h>
Date 2016-06-08 21:50 +0200
Message-ID <rHREd-4nR-13@gated-at.bofh.it> (permalink)
References <rHRux-4jK-11@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: "H. Peter Anvin" <hpa@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 <hpa@zytor.com>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 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

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v2 00/10] x86: use gcc 6+ asm flag output feature "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:40 +0200
  [PATCH v2 10/10] x86, asm: Use CC_SET()/CC_OUT() and static_cpu_has() in archrandom.h "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:40 +0200
    [tip:x86/asm] x86, asm: Use CC_SET()/CC_OUT() and static_cpu_has()  in archrandom.h "tip-bot for H. Peter Anvin" <tipbot@zytor.com> - 2016-06-08 22:00 +0200
    Re: [PATCH v2 10/10] x86, asm: Use CC_SET()/CC_OUT() and  static_cpu_has() in archrandom.h Borislav Petkov <bp@alien8.de> - 2016-06-09 17:50 +0200
  [PATCH v2 04/10] x86, asm: define CC_SET() and CC_OUT() macros "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:40 +0200
    [tip:x86/asm] x86, asm: define CC_SET() and CC_OUT() macros "tip-bot for H. Peter Anvin" <tipbot@zytor.com> - 2016-06-08 21:50 +0200
  [PATCH v2 06/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/bitops.h> "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:50 +0200
  [PATCH v2 02/10] x86, asm: use bool for bitops and other assembly outputs "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:50 +0200
  [PATCH v2 08/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/rwsem.h> "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:50 +0200
  [PATCH v2 07/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/percpu.h> "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:50 +0200
  [PATCH v2 05/10] x86, asm: change GEN_*_RMWcc() to use CC_SET()/CC_OUT() "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:50 +0200
  [PATCH v2 03/10] x86, asm: change the GEN_*_RMWcc() macros to not quote the condition "H. Peter Anvin" <hpa@linux.intel.com> - 2016-06-08 21:50 +0200
  Re: [PATCH v2 00/10] x86: use gcc 6+ asm flag output feature "H. Peter Anvin" <hpa@zytor.com> - 2016-06-08 23:40 +0200

csiph-web