From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751363AbcBFEtl (ORCPT ); Fri, 5 Feb 2016 23:49:41 -0500 Received: from mail.kernel.org ([198.145.29.136]:58607 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750815AbcBFEtk (ORCPT ); Fri, 5 Feb 2016 23:49:40 -0500 From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de Cc: konrad.wilk@oracle.com, rusty@rustcorp.com.au, luto@amacapital.net, boris.ostrovsky@oracle.com, mcb30@ipxe.org, jgross@suse.com, JBeulich@suse.com, joro@8bytes.org, ryabinin.a.a@gmail.com, long.wanglong@huawei.com, qiuxishi@huawei.com, aryabinin@virtuozzo.com, mchehab@osg.samsung.com, x86@kernel.org, xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH v2] x86/boot: add BIT() to boot/bitops.h Date: Fri, 5 Feb 2016 20:49:35 -0800 Message-Id: <1454734175-15328-1-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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. Signed-off-by: Luis R. Rodriguez --- 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 #include #include -#include #include "bitops.h" +#include #include "ctype.h" #include "cpuflags.h" -- 2.7.0