| Message ID | 1455891343-10016-2-git-send-email-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/19/2016 09:15 AM, Luis R. Rodriguez wrote: > diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h > index 878e4b9940d9..232cff0ff4e3 100644 > --- a/arch/x86/boot/bitops.h > +++ b/arch/x86/boot/bitops.h > @@ -40,4 +40,6 @@ static inline void set_bit(int nr, void *addr) > asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); > } > > +#define BIT(x) (1 << x) Parenthesize x.
On Fri, Feb 19, 2016 at 10:14:42AM -0500, Boris Ostrovsky wrote: > > > On 02/19/2016 09:15 AM, Luis R. Rodriguez wrote: > >diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h > >index 878e4b9940d9..232cff0ff4e3 100644 > >--- a/arch/x86/boot/bitops.h > >+++ b/arch/x86/boot/bitops.h > >@@ -40,4 +40,6 @@ static inline void set_bit(int nr, void *addr) > > asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); > > } > >+#define BIT(x) (1 << x) > > Parenthesize x. I'll just use (1UL << (nr)) then as well to match what include/linux/bitmap.h uses. Luis
diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h index 878e4b9940d9..232cff0ff4e3 100644 --- a/arch/x86/boot/bitops.h +++ b/arch/x86/boot/bitops.h @@ -40,4 +40,6 @@ static inline void set_bit(int nr, void *addr) asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); } +#define BIT(x) (1 << x) + #endif /* BOOT_BITOPS_H */ diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 9011a88353de..4fb53da1f48a 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -23,8 +23,8 @@ #include <stdarg.h> #include <linux/types.h> #include <linux/edd.h> -#include <asm/setup.h> #include "bitops.h" +#include <asm/setup.h> #include "ctype.h" #include "cpuflags.h"
The boot/bitops.h has guards against including the regular bitops (include/asm-generic/bitops.h), it only implements what we need at early boot. We'll be making use of BIT() later so add it. Users of boot/boot.h must include it prior to asm/setup.h otherwise the guard protection devised against the regular linux/bitops.h will not take effect. v2: spelling fixes, and language descriptipon enhancements by Konrad. Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> --- arch/x86/boot/bitops.h | 2 ++ arch/x86/boot/boot.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)