Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965573AbbLOWQ4 (ORCPT ); Tue, 15 Dec 2015 17:16:56 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35708 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932820AbbLOWQx (ORCPT ); Tue, 15 Dec 2015 17:16:53 -0500 From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, konrad.wilk@oracle.com Cc: 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, andreyknvl@google.com, long.wanglong@huawei.com, qiuxishi@huawei.com, aryabinin@virtuozzo.com, mchehab@osg.samsung.com, valentinrothberg@gmail.com, peter.senna@gmail.com, mcgrof@suse.com, x86@kernel.org, xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org Subject: [RFC v1 3/8] x86/boot: add BIT() to boot/bitops.h Date: Tue, 15 Dec 2015 14:16:32 -0800 Message-Id: <1450217797-19295-4-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1450217797-19295-1-git-send-email-mcgrof@do-not-panic.com> References: <1450217797-19295-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1471 Lines: 49 From: "Luis R. Rodriguez" 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/