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"