From patchwork Sat Feb 6 04:49:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8241601 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 09E07BEEE5 for ; Sat, 6 Feb 2016 04:52:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 051D0202E5 for ; Sat, 6 Feb 2016 04:52:51 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 25AC9202A1 for ; Sat, 6 Feb 2016 04:52:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRuoa-0000dc-46; Sat, 06 Feb 2016 04:49:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRuoY-0000dX-N6 for xen-devel@lists.xensource.com; Sat, 06 Feb 2016 04:49:42 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 55/A3-09708-56B75B65; Sat, 06 Feb 2016 04:49:41 +0000 X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1454734180!14315721!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10404 invoked from network); 6 Feb 2016 04:49:41 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-5.tower-21.messagelabs.com with SMTP; 6 Feb 2016 04:49:41 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F422202E5; Sat, 6 Feb 2016 04:49:39 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B77D4202A1; Sat, 6 Feb 2016 04:49:37 +0000 (UTC) From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de 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 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: jgross@suse.com, xen-devel@lists.xensource.com, x86@kernel.org, joro@8bytes.org, rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, luto@amacapital.net, aryabinin@virtuozzo.com, "Luis R. Rodriguez" , ryabinin.a.a@gmail.com, JBeulich@suse.com, long.wanglong@huawei.com, qiuxishi@huawei.com, boris.ostrovsky@oracle.com, mcb30@ipxe.org, mchehab@osg.samsung.com Subject: [Xen-devel] [PATCH v2] x86/boot: add BIT() to boot/bitops.h X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Konrad Rzeszutek Wilk --- 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"