From patchwork Thu Jan 5 02:20:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 89931 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp8767258qgi; Wed, 4 Jan 2017 18:21:47 -0800 (PST) X-Received: by 10.99.116.22 with SMTP id p22mr127202093pgc.161.1483582907573; Wed, 04 Jan 2017 18:21:47 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id u64si74210641pgc.175.2017.01.04.18.21.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2017 18:21:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cOxgW-00031s-Or; Thu, 05 Jan 2017 02:21:44 +0000 Received: from conuserg-09.nifty.com ([210.131.2.76]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cOxgJ-0002my-QH for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2017 02:21:32 +0000 Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v052KFNq001563; Thu, 5 Jan 2017 11:20:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v052KFNq001563 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1483582821; bh=vkP3prcq14i/PuLKiPTzBoH+Dt/o4FzEC/sruyz23pM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u0tEORVD/iJosU8loYJAzNw2TKJNAE0dDJSw/27K4K8Z+3MZXheTSKENWB0hb7gMf 0p+8mjrXvLXNJZMwRxJ919LUoe4DTRRirClPkD1eLDde69e1vtnjM2Al+Y/JsIOEtB nXCuisHiDiPTLr2yhoQOgF7fmIylYduwLYJH2NJiDTssqSrAMfQ3+CoI8KW/+W30OV eQUSYeHzpiIE3yp87amyH/1f+w6BHW5mcIa1VrVZKRElZ5jACCpk3oSNGMDeTfsYVM 9FlFNFHrP8limeFiMF0xYz9/LWkPyFsGx8F94JLai5VD34lK1dncyZuEieXc6LBYTC TK8yWkF2KSB7Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Subject: [PATCH v2 1/4] m68k: rename UL() to TO_UL() Date: Thu, 5 Jan 2017 11:20:06 +0900 Message-Id: <1483582810-7046-2-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170104_182132_194179_AC2C452E X-CRM114-Status: UNSURE ( 9.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Arnd Bergmann , Masahiro Yamada , Catalin Marinas , x86@kernel.org, Will Deacon , Russell King , linux-kernel@vger.kernel.org, David Howells , Olof Johansson , linux-m68k@lists.linux-m68k.org, Ingo Molnar , Geert Uytterhoeven , "H . Peter Anvin" , Srinivas Pandruvada , Thomas Gleixner , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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 am moving the former to a common header in the next commit. Beforehand, this commit renames the latter to avoid name conflict. Signed-off-by: Masahiro Yamada Acked-by: Geert Uytterhoeven --- 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 9c1e656..a625144 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -121,9 +121,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"