From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759987AbdAECYl (ORCPT ); Wed, 4 Jan 2017 21:24:41 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23782 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970155AbdAECYe (ORCPT ); Wed, 4 Jan 2017 21:24:34 -0500 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v052KFNt001563 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: "H . Peter Anvin" , Arnd Bergmann , David Howells , x86@kernel.org, Thomas Gleixner , Russell King , Srinivas Pandruvada , Ingo Molnar , Will Deacon , Mark Rutland , Olof Johansson , Catalin Marinas , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , Guoqing Jiang , linux-kernel@vger.kernel.org, zijun_hu , Guan Xuetao , Shaohua Li Subject: [PATCH v2 4/4] linux/const.h: move BIT(_ULL) to linux/const.h for use in assembly Date: Thu, 5 Jan 2017 11:20:09 +0900 Message-Id: <1483582810-7046-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483582810-7046-1-git-send-email-yamada.masahiro@socionext.com> References: <1483582810-7046-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 2fc016c5bd8a ("linux/const.h: Add _BITUL() and _BITULL()") introduced _BITUL() and _BITULL(). Its git-log says the difference from the already existing BIT() are: 1. The namespace is such that they can be used in uapi definitions. 2. The type is set with the _AC() macro to allow it to be used in assembly. 3. The type is explicitly specified to be UL or ULL. However, I found _BITUL() is often used for "2. use in assembly", while "1. use in uapi" is unneeded. If we address only "2.", we can improve the existing BIT() for that. It will allow us to replace many _BITUL() instances with BIT(), i.e. avoid needless use of underscore-prefixed macros, in the end, for better de-couple of userspace/kernel headers. Signed-off-by: Masahiro Yamada --- Changes in v2: None include/linux/bitops.h | 3 +-- include/linux/const.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/bitops.h b/include/linux/bitops.h index a83c822..5f45fa5 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,10 +1,9 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H +#include #include #ifdef __KERNEL__ -#define BIT(nr) (1UL << (nr)) -#define BIT_ULL(nr) (1ULL << (nr)) #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) #define BIT_ULL_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG)) diff --git a/include/linux/const.h b/include/linux/const.h index 7b55a55..200892d 100644 --- a/include/linux/const.h +++ b/include/linux/const.h @@ -6,4 +6,7 @@ #define UL(x) (_UL(x)) #define ULL(x) (_ULL(x)) +#define BIT(x) (_BITUL(x)) +#define BIT_ULL(x) (_BITULL(x)) + #endif /* _LINUX_CONST_H */ -- 2.7.4