From patchwork Fri Sep 23 07:49:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 116026 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D5CAAB6F81 for ; Fri, 23 Sep 2011 17:47:34 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R70Tk-0004t9-5S; Fri, 23 Sep 2011 07:47:24 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1R70Tj-0003Xg-P7; Fri, 23 Sep 2011 07:47:23 +0000 Received: from mail-yi0-f49.google.com ([209.85.218.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R70Th-0003XN-Cm for linux-arm-kernel@lists.infradead.org; Fri, 23 Sep 2011 07:47:22 +0000 Received: by yic24 with SMTP id 24so2989522yic.36 for ; Fri, 23 Sep 2011 00:47:19 -0700 (PDT) Received: by 10.68.32.225 with SMTP id m1mr8630165pbi.57.1316764038464; Fri, 23 Sep 2011 00:47:18 -0700 (PDT) Received: from localhost.localdomain ([114.218.200.12]) by mx.google.com with ESMTPS id n10sm35831789pbe.4.2011.09.23.00.47.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Sep 2011 00:47:17 -0700 (PDT) From: Shawn Guo To: Sascha Hauer Subject: [PATCH] arm/mxs: PHYS_OFFSET can not be defined in platform any longer Date: Fri, 23 Sep 2011 15:49:40 +0800 Message-Id: <1316764180-5722-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110923_034721_505979_59F6833F X-CRM114-Status: GOOD ( 15.57 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.218.49 listed in list.dnswl.org] Cc: Shawn Guo , patches@linaro.org, Russell King - ARM Linux , linux-arm-kernel@lists.infradead.org, Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Since ARM_PATCH_PHYS_VIRT has been globally enabled by default, PHYS_OFFSET can not be defined in platform any longer. Otherwise, we will run into the following warning. arch/arm/include/asm/memory.h:156:0: warning: "PHYS_OFFSET" redefined arch/arm/mach-mxs/include/mach/memory.h:22:0: note: this is the location of the previous definition Change PHYS_OFFSET to PLAT_PHYS_OFFSET to avoid the warning. Signed-off-by: Shawn Guo --- Yes, I know that Nicolas has a big patch to remove mach/memory.h globally. But rmk has not acked/pulled it. This patch is posted just for reminding that if Nicolas' patch does not hit v3.2, we will have to merge this patch to save a fix patch to remove the warning. arch/arm/mach-mxs/include/mach/memory.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mxs/include/mach/memory.h b/arch/arm/mach-mxs/include/mach/memory.h index b5420a5..0618ae2 100644 --- a/arch/arm/mach-mxs/include/mach/memory.h +++ b/arch/arm/mach-mxs/include/mach/memory.h @@ -19,6 +19,6 @@ #ifndef __MACH_MXS_MEMORY_H__ #define __MACH_MXS_MEMORY_H__ -#define PHYS_OFFSET UL(0x40000000) +#define PLAT_PHYS_OFFSET UL(0x40000000) #endif /* __MACH_MXS_MEMORY_H__ */