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: 10235467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B01C1602DC for ; Thu, 22 Feb 2018 12:18:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABB9528978 for ; Thu, 22 Feb 2018 12:18:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0C352897F; Thu, 22 Feb 2018 12:18:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2535F28978 for ; Thu, 22 Feb 2018 12:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=s7SOC2XqUKuv11+OSLPVID1rlzsTIQULahpmR02wSUE=; b=rgiFqEjkGQgMB0GxrBSy1awoy0 Sei0mtgC45603D15CqWCq/apWdB2wSEgAgxyCZfex6p3gmtmbNIxf3UFCl7FBkWTziSArHwZH1RW+ V13W9HtfpOY1FGLsSXJz7gpJQok/+yHPZUEF+MItAJ4svyiwRyvsIQ9nYevCmo1UowEdLFxzwJWyK EL1JE1WrlUvGgKaZq/HW3WRY0YPwKEuDkjhAe+HvUD6UzUgYqLAdk8peDF+il4OqHcc3k9Wnc0GK2 QmmJC04442RQYXfJ24VLvrRahTeuUQRFDqKSpjpwlT8E9rbdIPCPDhe3NJLg4VkKLOV0OC6xxGb+p SsDDVJ4Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eopox-0003Bj-2a; Thu, 22 Feb 2018 12:17:55 +0000 Received: from conuserg-10.nifty.com ([210.131.2.77]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eopnW-0002U4-Hy for linux-arm-kernel@lists.infradead.org; Thu, 22 Feb 2018 12:16:31 +0000 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180222_041626_955282_D56D1E4F X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. 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: linux-kernel@vger.kernel.org, David Howells , Masahiro Yamada , linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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"