From patchwork Thu Feb 22 12:15:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129222 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1935689edc; Thu, 22 Feb 2018 04:16:45 -0800 (PST) X-Google-Smtp-Source: AH8x226b+k2o+WAndT4YDDRODhJ2FrQVT1Fwlq20+QUE/TBvIvkZZX9gonDwYOYIZHfJDG92BGrQ X-Received: by 10.98.220.207 with SMTP id c76mr6667473pfl.159.1519301805372; Thu, 22 Feb 2018 04:16:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519301805; cv=none; d=google.com; s=arc-20160816; b=nvFdvlBKdIXa7FEVZkLXY7t4692wbKzfYLbE0/rvYJ2D2CiiF4ufWsd7JUCUsHxQdk W+0EW52dhzx5rTCRyHmpSxLGZRUvs1H9cnAlPlOHOtBxO3S6+3Qp4x9oCPw9tL3rSIqk qLkOg8yNYz6ZU5eTvesrTXQhvSQjuoKx038wYRWhvG56WTzILjAOBeX3u3XjFTK07NVw iKZ97yrGN2xEIMRIUOqZbrIt+hzMtRvVoFDV1ku/0OQg0tYVUpawD+MWuIv5OKXtGl4J mDP/2b9BDcojyzMYtcivD2aCz3DIulpynaOzKZlt2NqcQvPxoEkiGdAen/mUGgZYhjNY 45Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=45+u74fNHpnaXHWviwnehs+VE9r2iGHGrrC9K1HchMo=; b=xB0fEDKN6B2s16ZN5S/uqTDD6qVRYg5ESmkaOeK0tdpJIUCm1SaJ8N9HMN9jyJyk15 xJDHZ0RdcwzAGevYQ8NY7LMP/yh5ix7IndrOYk3yOEQAyIB8ZLi7e7E0CD9NzlyrwGgw ekCXtCCb24SzRRJoQt62PbuBTiP6LjpARYW0ejf/6FfJNG7n9iV1NJ2ae3DnHI/0ILi4 diK6wNeFH5AiRql/WJlZ7B1fUu/s0BP2tyJnDN8fZiCo0If2MTov82JF7EfUIO7uD4Ez XD9smnVLQiMsLH88ftDQRTHfjy+GnlGjT4PZ+QVcMK7DBxZNVRRj94EOGG+6M/gk5odu aZSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tYBBiVCU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si1230589pls.560.2018.02.22.04.16.45; Thu, 22 Feb 2018 04:16:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tYBBiVCU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932421AbeBVMQm (ORCPT + 28 others); Thu, 22 Feb 2018 07:16:42 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:61671 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932077AbeBVMQe (ORCPT ); Thu, 22 Feb 2018 07:16:34 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w1MCFdUE020774; Thu, 22 Feb 2018 21:15:43 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w1MCFdUE020774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519301743; bh=45+u74fNHpnaXHWviwnehs+VE9r2iGHGrrC9K1HchMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tYBBiVCUWcsq0gMsV+aXZjPjg6m1L3GfkJnwc9m5KhjYNdE8hasez4gUQXSCpH4+y egcrG1UFGqnh1H5/u+mXMPeBkZ8J0nH4KfNfFFJML8MQPmpIkX9a3QelHVn45cIVd0 4orO5cG3cPulqrlCxi8o1cwWrI7HPPH/rSwk6uLmetTwDNgzQypyGLdj3nUK0jCcbI ssdyVp6RcBFE7Hgk7pSTbwkMI3zafTP0CxtFWgINM+BDz2nnpM5G/2VMMvrohMAjPa 1LmSKTkxtwbXSAvd/NjzNiIOOvd6JJJ4d4dud/ItzP/9QO6CySAfeVLwrqnADuA2FH 0H9rhEgBNxqww== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: David Howells , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v3 1/5] linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI Date: Thu, 22 Feb 2018 21:15:11 +0900 Message-Id: <1519301715-31798-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> References: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I am going to add include/linux/const.h for the kernel space. Add _UAPI to the include guard of include/uapi/linux/const.h to prepare for that. Please notice the guard name of the exported one will be kept as-is. So, this commit has no impact to the userspace even if some userspace stuff depends on the guard macro names. scripts/headers_install.sh processes exported headers by SED, and rips off "_UAPI" from guard macro names. #ifndef _UAPI_LINUX_CONST_H #define _UAPI_LINUX_CONST_H will be turned into #ifndef _LINUX_CONST_H #define _LINUX_CONST_H Signed-off-by: Masahiro Yamada --- Changes in v3: - Split out as a prerequisite patch and describe detailed information Changes in v2: None include/uapi/linux/const.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 9253775..c5a60eb 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* const.h: Macros for dealing with constants. */ -#ifndef _LINUX_CONST_H -#define _LINUX_CONST_H +#ifndef _UAPI_LINUX_CONST_H +#define _UAPI_LINUX_CONST_H /* Some constant macros are used in both assembler and * C code. Therefore we cannot annotate them always with @@ -25,4 +25,4 @@ #define _BITUL(x) (_AC(1,UL) << (x)) #define _BITULL(x) (_AC(1,ULL) << (x)) -#endif /* !(_LINUX_CONST_H) */ +#endif /* _UAPI_LINUX_CONST_H */ From patchwork Thu Feb 22 12:15:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129223 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1936097edc; Thu, 22 Feb 2018 04:17:10 -0800 (PST) X-Google-Smtp-Source: AH8x224yRS33cNvXMMg3j05wUCe8KjLfJ4hrgSh+XXZHkZ8xTr/yhkLNzvSwL7LkwL8qSvX9nMY7 X-Received: by 10.99.110.131 with SMTP id j125mr5559925pgc.382.1519301830061; Thu, 22 Feb 2018 04:17:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519301830; cv=none; d=google.com; s=arc-20160816; b=0wuLi2TuRlA0Zpjiqo7o6wk3VVCvBTHjWyjIKOVtX834McGSXLCOU52HKYJw8Pmk// rmFBnKYgcGbp1u43cegDlyBsC9Meo9YC88SFQ+uFvwRjfwqDuDnddgp0hsXZbgBAZmgq K/8OMXSivkglImdhhV7RDr+PClELWAj+tOCOE/fnlcpbl/B5JN1zwT3X4aCeXY6EqzG/ QTqWPAhZ1GoxV4W3uc9r9VPa6QIMUXBsah8TaxXREXwoVB4+1TJKtDEkTw+D0Bbnthpu /+1KxRVI+SeqAOB2gOgU6g9975ewalr1lW4Rog/2RdRwstzm0vaHvgvzH66iz+ok2IE6 6RZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=NoEEODRcdPXHEcLkem72er/AOe0o1RpUwYBMMuPnioY=; b=XgVLwQkr60I00PzZMBou7tZ54SNmy8xhdSiv6KCBqtYt7GcNvytPtvTmQ1/+FuZ+ML hkDxcq3PzNlGaipMZi3PIkdac9ojGCqwUwci1XFc7agvTeiUJamfxR/6m7bh/Cyfpn3f 2k6RlyX/pAW4Fu0TQ5AYY7VmK7MHvYKbpSK0DxNYIWIeQIfZGJGNemMmPgr2rtQXIvLM i8gUAoobi1fSfslDnUTQ8opcuZYwaSfX7DjYqSHEBUs2r4+WTTDosU+Bl8Bg3jj8MKhO WYMitQzUoInPwi2GfgB1k8qiVbqBE+4T0nWGO11ZpDxLIuU65y06JfktnhIrbrGij9FR kpjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UEcm5/pk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z188si1906593pgb.592.2018.02.22.04.17.09; Thu, 22 Feb 2018 04:17:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UEcm5/pk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932481AbeBVMQw (ORCPT + 28 others); Thu, 22 Feb 2018 07:16:52 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:62104 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932455AbeBVMQu (ORCPT ); Thu, 22 Feb 2018 07:16:50 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w1MCFdUF020774; Thu, 22 Feb 2018 21:15:44 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w1MCFdUF020774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519301745; bh=NoEEODRcdPXHEcLkem72er/AOe0o1RpUwYBMMuPnioY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UEcm5/pk4svVFr9I8TzvIGArSFc0IELxMU6VjIkaWo6cMM8og3kFovpjS/gA1A3VF 5Aw56edpwyi65oZ5kOS3cCX1T/DkkIMfrWRK1JzqZLx6V3b8AUyhARtclA8jrUxLBR Pn8VO0OY5Tg9g1UhMstMsMJ8y1+03nX5MmNuso3cwkxoNTkY3h0Nkg6f9wO4e75N1S tNxsmYYyJuCU87wSWpyhD5SZt/Mod4jtj/vrUShjnWELMYRRqv/VgoqIXsf3MOBBEq 7Ezub5A9Widn5RNgPzYAISBBwyPQkxd1ZejQpOZNsyEZuFNtH+5AfuCynqTwlCO6TU PGwVbJHuO5i+A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: David Howells , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] m68k: rename UL() to TO_UL() Date: Thu, 22 Feb 2018 21:15:12 +0900 Message-Id: <1519301715-31798-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> References: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ARM, ARM64 and UniCore32 define UL(x) like follows: #define UL(x) _AC(x, UL) While, M68K defines it differently: #define UL(x) ((unsigned long) (x)) I want to move the former to a common header. Beforehand, this commit renames the latter to avoid name conflict. Signed-off-by: Masahiro Yamada Acked-by: Geert Uytterhoeven --- V2: https://patchwork.kernel.org/patch/9498273/ Changes in v3: None Changes in v2: - Split out as a prerequisite patch arch/m68k/mm/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index e85acd1..583a8e5 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -122,9 +122,9 @@ void free_initmem(void) void __init print_memmap(void) { -#define UL(x) ((unsigned long) (x)) -#define MLK(b, t) UL(b), UL(t), (UL(t) - UL(b)) >> 10 -#define MLM(b, t) UL(b), UL(t), (UL(t) - UL(b)) >> 20 +#define TO_UL(x) ((unsigned long) (x)) +#define MLK(b, t) TO_UL(b), TO_UL(t), (TO_UL(t) - TO_UL(b)) >> 10 +#define MLM(b, t) TO_UL(b), TO_UL(t), (TO_UL(t) - TO_UL(b)) >> 20 #define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), 1024) pr_notice("Virtual kernel memory layout:\n" From patchwork Thu Feb 22 12:15:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129224 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1936304edc; Thu, 22 Feb 2018 04:17:21 -0800 (PST) X-Google-Smtp-Source: AH8x2263o1o7Krpd2Ss6YTf9NvXKjnu2hPc5JLk2C9OcfFS4bBRjJWtdQXrkbvP2IWhwK9nZrzzh X-Received: by 10.98.138.66 with SMTP id y63mr6757025pfd.12.1519301841521; Thu, 22 Feb 2018 04:17:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519301841; cv=none; d=google.com; s=arc-20160816; b=FDMy93J+HF4+ukFaMaCDjwiOUC7X/4Y5L9ifMSJW7bY4eb8hEOZM9r/bQDWF49VuvG /gppC6f0KGJT2PUIqN0Zy8X5vTaLNEtlPdgRHirw2Wd3M9JCj5ewoWud5LjD2mvz2p3u oh4wm7CDbl13MvrCk/ijTijLZaFcEivHtyFjDnxMKmEeEm4dSg41MRt1MNPjNe62XFWI fldrUE6SaksAJc24uBsFhrbiLwykjr/TBXJjlwLIKMdR+pf7tSMzhC2ajisBHYarJHkX Ey+c2bn8waOQpg9fdWxZvjOwRINnG35ELhuIWxFYbUpBVchMxBy/Fx9suB0i2iNMOIJa D77A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=E9EX6i0PEyHhg4sg+u434t4COh6n5wv4gTCzms5BId0=; b=YFvM1uv3YXIsVVlgGDcSf8i0J5zTHxYMEtvvNSsuYyzf7CLgqoCMeHBwnal2csyOoI uPS9ldoguHMdR6Q6+t6r40bAHsXOGek1v4SUnjKfTCf0a9xwMD5Bja1A8PKFyyq7SFWZ O2PjBF1XCp7XmqmnK6qZdCiAI4WrMxwuwJidbjN7lpWZGHTsDrqaR7MOodUVeN2HL3ln 0f6NwTrsfl+LFMd5PAGUx8t4gC3OOXo5GmJIkkn6LCZeC1Wo+piIMRrId+/JJsCL29Nl 6jfNQ/MfoVwk8zb3GhFk884OqxRrkxEGddI8kcYgDxMJ30yYvtBMeTswOHxl/EEXTLwG ZHBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1TtD0ymU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l18si2829403pgn.339.2018.02.22.04.17.21; Thu, 22 Feb 2018 04:17:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=1TtD0ymU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932451AbeBVMRR (ORCPT + 28 others); Thu, 22 Feb 2018 07:17:17 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:62858 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753806AbeBVMRQ (ORCPT ); Thu, 22 Feb 2018 07:17:16 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w1MCFdUG020774; Thu, 22 Feb 2018 21:15:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w1MCFdUG020774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519301748; bh=E9EX6i0PEyHhg4sg+u434t4COh6n5wv4gTCzms5BId0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1TtD0ymUV8EJv+9iLXJDUQpb87KhBo2/zP+78LFs9n0ALLWrMuI06sCJAobJ4+xP1 1kCZplE22Y8O2sIFVH8lpwxMUNgg56YQJTSai8AZg8UABuDLeS+s4iT2V66GTnSjAF rzgQbSQUW3AqlJcKRBFiAE4y8Arz+t4Rgf7jY2H9SvT84n5nwvElaukOD6O0Tm+fc0 4FELsuddalTXA5i8IrHQdV1IyH4b+dwVbzihB18/j1ErJsHdS7SDdz6mql0qp0Nz/O E/J3uFPNeSebKqSh7clTssmtrgNyRWa3FmEGy+8IBRbIJtVaJhPdGi0ukoEiN5jD2M DD+8tO3N4MUWg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: David Howells , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Guan Xuetao , Will Deacon , Catalin Marinas , Russell King Subject: [PATCH v3 3/5] linux/const.h: move UL() macro to include/linux/const.h Date: Thu, 22 Feb 2018 21:15:13 +0900 Message-Id: <1519301715-31798-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> References: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ARM, ARM64 and UniCore32 duplicate the definition of UL(): #define UL(x) _AC(x, UL) This is not actually arch-specific, so it will be useful to move it to a common header. Currently, we only have the uapi variant for linux/const.h, so I am creating include/linux/const.h. I also added _UL(), _ULL() and ULL() because _AC() is mostly used in the form either _AC(..., UL) or _AC(..., ULL). I expect they will be replaced in follow-up cleanups. The underscore-prefixed ones should be used for exported headers. Signed-off-by: Masahiro Yamada Acked-by: Guan Xuetao Acked-by: Catalin Marinas Acked-by: Russell King --- V2: https://patchwork.kernel.org/patch/9498275/ Changes in v3: None Changes in v2: None arch/arm/include/asm/memory.h | 6 ------ arch/arm64/include/asm/memory.h | 6 ------ arch/unicore32/include/asm/memory.h | 6 ------ include/linux/const.h | 9 +++++++++ include/uapi/linux/const.h | 3 +++ 5 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 include/linux/const.h -- 2.7.4 diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 4966677..ed8fd0d 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -22,12 +22,6 @@ #include #endif -/* - * Allow for constants defined here to be used from assembly code - * by prepending the UL suffix only with actual C code compilation. - */ -#define UL(x) _AC(x, UL) - /* PAGE_OFFSET - the virtual address of the start of the kernel image */ #define PAGE_OFFSET UL(CONFIG_PAGE_OFFSET) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 50fa96a..49d9921 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -29,12 +29,6 @@ #include /* - * Allow for constants defined here to be used from assembly code - * by prepending the UL suffix only with actual C code compilation. - */ -#define UL(x) _AC(x, UL) - -/* * Size of the PCI I/O space. This must remain a power of two so that * IO_SPACE_LIMIT acts as a mask for the low bits of I/O addresses. */ diff --git a/arch/unicore32/include/asm/memory.h b/arch/unicore32/include/asm/memory.h index 3bb0a29..66bb9f6 100644 --- a/arch/unicore32/include/asm/memory.h +++ b/arch/unicore32/include/asm/memory.h @@ -20,12 +20,6 @@ #include /* - * Allow for constants defined here to be used from assembly code - * by prepending the UL suffix only with actual C code compilation. - */ -#define UL(x) _AC(x, UL) - -/* * PAGE_OFFSET - the virtual address of the start of the kernel image * TASK_SIZE - the maximum size of a user space task. * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area diff --git a/include/linux/const.h b/include/linux/const.h new file mode 100644 index 0000000..7b55a55 --- /dev/null +++ b/include/linux/const.h @@ -0,0 +1,9 @@ +#ifndef _LINUX_CONST_H +#define _LINUX_CONST_H + +#include + +#define UL(x) (_UL(x)) +#define ULL(x) (_ULL(x)) + +#endif /* _LINUX_CONST_H */ diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index c5a60eb..09bc0e0 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -22,6 +22,9 @@ #define _AT(T,X) ((T)(X)) #endif +#define _UL(x) (_AC(x, UL)) +#define _ULL(x) (_AC(x, ULL)) + #define _BITUL(x) (_AC(1,UL) << (x)) #define _BITULL(x) (_AC(1,ULL) << (x)) From patchwork Thu Feb 22 12:15:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129226 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1937287edc; Thu, 22 Feb 2018 04:18:24 -0800 (PST) X-Google-Smtp-Source: AH8x224M727NmCr93SLWvU3+HyjcZS6MR0g3+28uh/0QSGIlF4ePQjXlzA89VL88T8EmgblkhxHo X-Received: by 10.99.180.79 with SMTP id n15mr5708190pgu.314.1519301904021; Thu, 22 Feb 2018 04:18:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519301904; cv=none; d=google.com; s=arc-20160816; b=uU+ipIdD4MnYb9fFcB3sul2j2MVx330oX9fGxOuEMXfRN9BlRcIeT8b3MoXwZxvDvv /wmdK4btfzTfrQz0Ey2tvoyIaX5JEgo6rVBSpVkmdHaWViMUj9Z8wT0K66j5hG6nDpi4 7umibsi/CPp8to4OhM+q1ljMCZgNFZiXPd242gQo84sXPet7vOQnc3LTi7SZ8tmQ0Gfw 5+FndoPiIgxE6QcGhj8QTOjirWcGl1kpV4aTnVxjvx2f6hJxVtGJSCJErGH1q85Nf6k0 Vxodv5c33oIIk8z4Lwo+4qHB7G0BtPxXE2PNkE6ivPh/g3X9Eo7Uea4H3G/oMyX4LDWu knsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=VoieKgrt3ZmAO14oJQ59FpTkz02eEwwKUJ1hjsixGkY=; b=fOgZ0MEwb6WyAthb+IcZpVPkjCTEVLuLIQ7toBy2aQaKU17fwH0nw1M/luTZcPUs0X YiC4zjwVYrn0sDwzZWjKRAfovyjxdhKso68mSWh56czdlg4zAu8UAM0VFjGXoUdf6uJG J+IFvEKL1FEFrU7gqdKbrqi+Brs56V+Yct9gHp5EUPGolritMRUBsxdIy0T3eUf+FgJI RC392GHeA7p7VRN4WynX2i25Jsx0IykMDTCV1Pks4oNO+PKMNRluZnSkTzvfCygKvxAH VTrKdyGg8m3yHn8Ovyl7QBOoNQ/jPW8IfCxEglz0C4NaeQnj2ACSzLsOJdA/IkXZPpbr kFZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=uidpp8jr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i194si2860197pgd.511.2018.02.22.04.18.23; Thu, 22 Feb 2018 04:18:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=uidpp8jr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932396AbeBVMQl (ORCPT + 28 others); Thu, 22 Feb 2018 07:16:41 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:61683 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932344AbeBVMQe (ORCPT ); Thu, 22 Feb 2018 07:16:34 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w1MCFdUH020774; Thu, 22 Feb 2018 21:15:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w1MCFdUH020774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519301749; bh=VoieKgrt3ZmAO14oJQ59FpTkz02eEwwKUJ1hjsixGkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uidpp8jrDrEl845E8JxoutO1vpscWSJJ7IBdbI2axjRg02FbwlJViOtmuc1MDPu5x B7P3y9WkiSlT1h3xG2JwzVpPk6d8J0q87l/BW3IrpRj8vfUX87w3foj6b3UHrqMpX5 CwO5/fITBYwcpKXEt+pqR3CZmyGYhCrHYghWyCkrtJ4PGnpjmnK3h7SnQyAGpDXHZO 414myrrVulwQuker8MPg1uDwYMR+2rIu9Tgr4x0V4DYjhmTkV8FidsNQMu9DcFRR2g yKb6DsMViF8c/Z4sF6TIuadFesMeLylVnAbQg/nx6QfGcktFpVWgJT7+0HpO/B3FIC CBbhdjkk1n65w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: David Howells , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] linux/const.h: refactor _BITUL and _BITULL a bit Date: Thu, 22 Feb 2018 21:15:14 +0900 Message-Id: <1519301715-31798-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> References: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Minor cleanups available by _UL and _ULL. Signed-off-by: Masahiro Yamada --- V2: https://patchwork.kernel.org/patch/9498269/ Changes in v3: None Changes in v2: None include/uapi/linux/const.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 09bc0e0..5ed721a 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -25,7 +25,7 @@ #define _UL(x) (_AC(x, UL)) #define _ULL(x) (_AC(x, ULL)) -#define _BITUL(x) (_AC(1,UL) << (x)) -#define _BITULL(x) (_AC(1,ULL) << (x)) +#define _BITUL(x) (_UL(1) << (x)) +#define _BITULL(x) (_ULL(1) << (x)) #endif /* _UAPI_LINUX_CONST_H */ From patchwork Thu Feb 22 12:15:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129227 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1937451edc; Thu, 22 Feb 2018 04:18:36 -0800 (PST) X-Google-Smtp-Source: AH8x225wMfTkW8OhgLNGie65+iLnWNi7L/ED0awjuH4oByavbQPaZTco9q8SYKRgs3QxTd7rcfRz X-Received: by 10.99.125.92 with SMTP id m28mr5597048pgn.257.1519301916601; Thu, 22 Feb 2018 04:18:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519301916; cv=none; d=google.com; s=arc-20160816; b=UywlQy+Yf9SKn6VdgJ6MdWTKRhmm3oJKm7esJb/Xmo8a+ZwB4VjihpC20IfOf8Tg9w xcDed7a0rlqaNyTp4YFWa3YDQHnSAg5Is1pGSCN9kE60EsnYMHRKQYAQJXLsscwVaAu+ 5htfyp9IsqI7HxOC5CHUoGXDfzhL12Fc5WLcBvcQZD3MK5zAowF2qTKrDh8bSdKqunbj ChUhkENN4Ss6TBpRFT8+RGoGjS1XYDfp1TJYRtwjMqEJyXKAwNFVJK4i3mlmCJknqJNd PnlK5Od9heR9VkBs0UFpk3pGgjLkxFm5UwWx8iAHqBQyOr+YHxhot2EIMJblRG2d+J6P ULQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=OODoCNzKccripyzjGugdv2zqywwlJRBm39YrW6b3xS0=; b=h/j7d4mKOHuxBpnb25gJUUSaNb8oixQHtx81+jpFzYrhexVGpRY7s4IKF5brGdWd+f wU3JGbEUAZy5wVhFCQzk9Ul8srMaVllDFEblVN/wtNR+3vkt9uK9uVDi3FyIuM5bkbhS eSSlvkYFHyOCrdvAssT0OjXPU/DZmCrgjyrzzgG358VKlqTiA1TU86RtF303p4IXTr9+ MyqwMXDuYH/IZHiME9UuFnapb/RTcIUS6Za2KlVZ0aChP8GRR0FnPWkJl8rvwgELaJUe TVzOmRj1V+gsrw0PslSOQvHeY47tYmRAr9UoEBMvI1fh5IBgvpfqKCs4ETXD9q3dG+ee 5q2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HZCUg7uZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r13-v6si1505434plj.141.2018.02.22.04.18.36; Thu, 22 Feb 2018 04:18:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HZCUg7uZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932377AbeBVMQj (ORCPT + 28 others); Thu, 22 Feb 2018 07:16:39 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:61711 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932316AbeBVMQf (ORCPT ); Thu, 22 Feb 2018 07:16:35 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w1MCFdUI020774; Thu, 22 Feb 2018 21:15:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w1MCFdUI020774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519301751; bh=OODoCNzKccripyzjGugdv2zqywwlJRBm39YrW6b3xS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HZCUg7uZjIntjiJ0UCB79Llomk+whEGKU4Y5HhN+FxaiInggpDKytl0yVyW1tQ2jX ci7UVrGmvWL+WOBK8iVZ0gWCNTFFVB4oTdJqDiSuXw+YskAoeSViqdC7CJDtQG05pz 8FU+O9SX0+yCr9R9kNgTMcteDglil50XjpQSsw+87MbxR8oysi1Y3Jr8Dusqajscnk 3kv7AeC+WWItfCgK/tiwP7y4OaSbHOULRy/uDWoEHrZxKAwU+fhSABAT9IQ9ypgK/m Dl5TV4DjGVzDG6pBHARzGaFfYA3aKAMdhG2EUg82JZKFTvIi+6xWMWPIwuxUIxNelK g7vR4HchWPVHQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: David Howells , linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] linux/const.h: move BIT(_ULL) to linux/const.h for use in assembly Date: Thu, 22 Feb 2018 21:15:15 +0900 Message-Id: <1519301715-31798-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> References: <1519301715-31798-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk 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 mostly used in kernel-space since it is handy to share headers between C and assembly. If we only need '2.', we can improve the existing BIT() for use in assembly, allowing us to avoid unnecessary underscore prefixes. Signed-off-by: Masahiro Yamada --- V2: https://patchwork.kernel.org/patch/9498271/ Changes in v3: None Changes in v2: None include/linux/bitops.h | 3 +-- include/linux/const.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 4cac4e1..8a856be 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,11 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ #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 */