Skip to contentSkip to conversation

x86/boot: add BIT() to boot/bitops.h

PATCH In review Luis R. Rodriguez 2 participants 2 messages Feb 6, 2016 – Feb 12, 2016 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/boot: add BIT() to boot/bitops.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.

---

This patch is originally part of a much larger series [0], this is v2 of the original patch 3/8 [1]. I've split this single patch out on its own now that it should be clear how I intend on using BIT() on early code.

[0] http://lkml.kernel.org/r/[email protected]
[1] http://lkml.kernel.org/r/[email protected]

 arch/x86/boot/bitops.h | 2 ++
 arch/x86/boot/boot.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/x86/boot/bitops.h +2 -0
index 878e4b9940d9..232cff0ff4e3 100644
@@ -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 */
arch/x86/boot/boot.h +1 -1
index 9011a88353de..4fb53da1f48a 100644
@@ -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"
 
Signature · 1 line
2.7.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Luis R. Rodriguez

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

<laughs> descriptioioppnipoio ? :-)

Quoted 3 lines

by Konrad.

Quoted 42 lines

---

This patch is originally part of a much larger series [0], this is v2 of the original patch 3/8 [1]. I've split this single patch out on its own now that it should be clear how I intend on using BIT() on early code.

[0] http://lkml.kernel.org/r/[email protected]
[1] http://lkml.kernel.org/r/[email protected]

 arch/x86/boot/bitops.h | 2 ++
 arch/x86/boot/boot.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/x86/boot/bitops.h +2 -0
index 878e4b9940d9..232cff0ff4e3 100644
@@ -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 */
arch/x86/boot/boot.h +1 -1
index 9011a88353de..4fb53da1f48a 100644
@@ -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"
 
Signature · 1 line
2.7.0