lkml.org 
[lkml]   [2015]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC v1 3/8] x86/boot: add BIT() to boot/bitops.h
Date
From: "Luis R. Rodriguez" <mcgrof@suse.com>

The boot/bitops.h guards against included the regular bitops,
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 devise against the regular
linux/bitops.h will not take effect.

Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
arch/x86/boot/bitops.h | 2 ++
arch/x86/boot/boot.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)

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"

--
2.6.2


\
 
 \ /
  Last update: 2015-12-15 23:41    [W:0.803 / U:0.960 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site