[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1454734175-15328-1-git-send-email-mcgrof@kernel.org>
Date: Fri, 5 Feb 2016 20:49:35 -0800
From: "Luis R. Rodriguez" <mcgrof@...nel.org>
To: hpa@...or.com, tglx@...utronix.de, mingo@...hat.com, bp@...en8.de
Cc: konrad.wilk@...cle.com, rusty@...tcorp.com.au, luto@...capital.net,
boris.ostrovsky@...cle.com, mcb30@...e.org, jgross@...e.com,
JBeulich@...e.com, joro@...tes.org, ryabinin.a.a@...il.com,
long.wanglong@...wei.com, qiuxishi@...wei.com,
aryabinin@...tuozzo.com, mchehab@....samsung.com, x86@...nel.org,
xen-devel@...ts.xensource.com, linux-kernel@...r.kernel.org,
"Luis R. Rodriguez" <mcgrof@...nel.org>
Subject: [PATCH v2] 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.
Signed-off-by: Luis R. Rodriguez <mcgrof@...nel.org>
---
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/1450217797-19295-1-git-send-email-mcgrof@do-not-panic.com
[1] http://lkml.kernel.org/r/1450217797-19295-4-git-send-email-mcgrof@do-not-panic.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.7.0
Powered by blists - more mailing lists