From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
luto@amacapital.net, boris.ostrovsky@oracle.com,
rusty@rustcorp.com.au, david.vrabel@citrix.com,
konrad.wilk@oracle.com, mcb30@ipxe.org, jgross@suse.com,
andriy.shevchenko@linux.intel.com, xen-devel@lists.xensource.com,
"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [RFC v2 1/6] x86/boot: add BIT() to boot/bitops.h
Date: Fri, 19 Feb 2016 06:15:38 -0800 [thread overview]
Message-ID: <1455891343-10016-2-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1455891343-10016-1-git-send-email-mcgrof@kernel.org>
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(-)
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
next prev parent reply other threads:[~2016-02-19 14:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 14:15 [RFC v2 0/6] x86/init: use linker table Luis R. Rodriguez
2016-02-19 14:15 ` Luis R. Rodriguez [this message]
2016-02-19 15:14 ` [RFC v2 1/6] x86/boot: add BIT() to boot/bitops.h Boris Ostrovsky
2016-02-19 21:03 ` Luis R. Rodriguez
2016-02-19 14:15 ` [RFC v2 2/6] x86/init: use linker tables to simplify x86 init and annotate dependencies Luis R. Rodriguez
2016-02-19 16:40 ` Andy Lutomirski
2016-02-20 0:42 ` Luis R. Rodriguez
2016-02-20 7:30 ` Andy Lutomirski
2016-02-27 0:19 ` Luis R. Rodriguez
2016-02-19 14:15 ` [RFC v2 3/6] x86/init: move ebda reservations into linker table Luis R. Rodriguez
2016-02-19 14:15 ` [RFC v2 4/6] x86/init: use linker table for i386 early setup Luis R. Rodriguez
2016-02-19 14:15 ` [RFC v2 5/6] x86/init: user linker table for ce4100 " Luis R. Rodriguez
2016-02-19 14:15 ` [RFC v2 6/6] x86/init: use linker table for mid " Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455891343-10016-2-git-send-email-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=david.vrabel@citrix.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mcb30@ipxe.org \
--cc=mingo@redhat.com \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.