From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm/mxs: PHYS_OFFSET can not be defined in platform any longer
Date: Fri, 23 Sep 2011 15:49:40 +0800 [thread overview]
Message-ID: <1316764180-5722-1-git-send-email-shawn.guo@linaro.org> (raw)
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 <shawn.guo@linaro.org>
---
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__ */
--
1.7.4.1
reply other threads:[~2011-09-23 7:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316764180-5722-1-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).