From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [RFC v1 3/8] x86/boot: add BIT() to boot/bitops.h Date: Wed, 20 Jan 2016 15:17:18 -0500 Message-ID: <20160120201718.GC4769@char.us.oracle.com> References: <1450217797-19295-1-git-send-email-mcgrof@do-not-panic.com> <1450217797-19295-4-git-send-email-mcgrof@do-not-panic.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1450217797-19295-4-git-send-email-mcgrof@do-not-panic.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "Luis R. Rodriguez" Cc: peter.senna@gmail.com, ryabinin.a.a@gmail.com, JBeulich@suse.com, hpa@zytor.com, qiuxishi@huawei.com, boris.ostrovsky@oracle.com, xen-devel@lists.xensource.com, joro@8bytes.org, x86@kernel.org, mingo@redhat.com, aryabinin@virtuozzo.com, mchehab@osg.samsung.com, andreyknvl@google.com, mcgrof@suse.com, rusty@rustcorp.com.au, bp@alien8.de, tglx@linutronix.de, mcb30@ipxe.org, valentinrothberg@gmail.com, jgross@suse.com, linux-kernel@vger.kernel.org, luto@amacapital.net, long.wanglong@huawei.com List-Id: xen-devel@lists.xenproject.org On Tue, Dec 15, 2015 at 02:16:32PM -0800, Luis R. Rodriguez wrote: > From: "Luis R. Rodriguez" > > The boot/bitops.h guards against included the regular bitops, It may sounds better this way: 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. Where? Could you paste in the name of the patch in the description? > > Users of boot/boot.h must include it prior to asm/setup.h > otherwise the guard protection devise against the regular s/devise/devised/ > linux/bitops.h will not take effect. > > Signed-off-by: Luis R. Rodriguez > --- > 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 > #include > #include > -#include > #include "bitops.h" > +#include > #include "ctype.h" > #include "cpuflags.h" > > -- > 2.6.2 >