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: 4295 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C6BBC23EFB for ; Fri, 23 Sep 2011 07:47:21 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id B459CA188EC for ; Fri, 23 Sep 2011 07:47:21 +0000 (UTC) Received: by fxe23 with SMTP id 23so4978701fxe.11 for ; Fri, 23 Sep 2011 00:47:21 -0700 (PDT) Received: by 10.223.33.19 with SMTP id f19mr4491746fad.122.1316764041483; Fri, 23 Sep 2011 00:47:21 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs201897lad; Fri, 23 Sep 2011 00:47:21 -0700 (PDT) Received: by 10.150.131.15 with SMTP id e15mr3117029ybd.429.1316764039713; Fri, 23 Sep 2011 00:47:19 -0700 (PDT) Received: from mail-yi0-f50.google.com (mail-yi0-f50.google.com [209.85.218.50]) by mx.google.com with ESMTPS id l15si5620003ybe.30.2011.09.23.00.47.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Sep 2011 00:47:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.218.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.218.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.218.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by yib25 with SMTP id 25so3995168yib.37 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 Cc: linux-arm-kernel@lists.infradead.org, Nicolas Pitre , Russell King - ARM Linux , patches@linaro.org, Shawn Guo 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 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__ */