From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032334AbdAECYq (ORCPT ); Wed, 4 Jan 2017 21:24:46 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23818 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970165AbdAECYk (ORCPT ); Wed, 4 Jan 2017 21:24:40 -0500 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v052KFNq001563 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 , Geert Uytterhoeven , linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org 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 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(-) 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" -- 2.7.4