Commit bdd50d74 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Thomas Gleixner
Browse files

x86/bitops: Use __builtin_constant_p() directly instead of IS_IMMEDIATE() 



__builtin_constant_p(nr) is used everywhere now. It does not make much
sense to define IS_IMMEDIATE() as its alias.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190723074415.26811-1-yamada.masahiro@socionext.com
parent f240652b

arch/x86/include/asm/bitops.h

+3 −4
Original line number Diff line number Diff line
@@ -45,14 +45,13 @@ 
 * We do the locked ops that don't return the old value as

 * a mask operation on a byte.

 */

#define IS_IMMEDIATE(nr)		(__builtin_constant_p(nr))

#define CONST_MASK_ADDR(nr, addr)	WBYTE_ADDR((void *)(addr) + ((nr)>>3))

#define CONST_MASK(nr)			(1 << ((nr) & 7))



static __always_inline void

arch_set_bit(long nr, volatile unsigned long *addr)

{

	if (IS_IMMEDIATE(nr)) {

	if (__builtin_constant_p(nr)) {

		asm volatile(LOCK_PREFIX "orb %1,%0"

			: CONST_MASK_ADDR(nr, addr)

			: "iq" ((u8)CONST_MASK(nr))
@@ -72,7 +71,7 @@ arch___set_bit(long nr, volatile unsigned long *addr) 
static __always_inline void

arch_clear_bit(long nr, volatile unsigned long *addr)

{

	if (IS_IMMEDIATE(nr)) {

	if (__builtin_constant_p(nr)) {

		asm volatile(LOCK_PREFIX "andb %1,%0"

			: CONST_MASK_ADDR(nr, addr)

			: "iq" ((u8)~CONST_MASK(nr)));
@@ -123,7 +122,7 @@ arch___change_bit(long nr, volatile unsigned long *addr) 
static __always_inline void

arch_change_bit(long nr, volatile unsigned long *addr)

{

	if (IS_IMMEDIATE(nr)) {

	if (__builtin_constant_p(nr)) {

		asm volatile(LOCK_PREFIX "xorb %1,%0"

			: CONST_MASK_ADDR(nr, addr)

			: "iq" ((u8)CONST_MASK(nr)));

CRA Git | Maintained and supported by SUSTech CRA and CCSE