From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] Revert 75f4aa1 (unconditionally define __virt_to_phys and __phys_to_virt)
Date: Thu, 15 Oct 2009 13:22:04 +0100 [thread overview]
Message-ID: <20091015122204.739.25384.stgit@pc1117.cambridge.arm.com> (raw)
In-Reply-To: <20091015121927.739.32071.stgit@pc1117.cambridge.arm.com>
The SPARSEMEM support for RealView PBX requires non-linear physical to
virtual address translation.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Nicolas Pitre <nico@cam.org>
---
arch/arm/include/asm/memory.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index cefedf0..bc2ff8b 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -125,8 +125,10 @@
* private definitions which should NOT be used outside memory.h
* files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
*/
+#ifndef __virt_to_phys
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
+#endif
/*
* Convert a physical address to a Page Frame Number and back
next prev parent reply other threads:[~2009-10-15 12:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-15 12:21 [PATCH 0/4] RealView patches for 2.6.33 Catalin Marinas
2009-10-15 12:21 ` [PATCH 1/4] RealView: Add default memory configuration Catalin Marinas
2009-10-15 12:21 ` [PATCH 2/4] RealView: Remove duplicated #define REALVIEW_SYS_FLAGS* statements Catalin Marinas
2009-10-15 12:22 ` Catalin Marinas [this message]
2009-10-19 15:34 ` [PATCH 3/4] Revert 75f4aa1 (unconditionally define __virt_to_phys and __phys_to_virt) Russell King - ARM Linux
2009-10-19 15:46 ` Catalin Marinas
2009-10-19 15:54 ` Russell King - ARM Linux
2009-10-15 12:22 ` [PATCH 4/4] RealView: Add sparsemem support for the RealView PBX platform Catalin Marinas
2009-10-19 15:46 ` Russell King - ARM Linux
2009-10-19 16:03 ` Catalin Marinas
2009-11-08 17:45 ` Russell King - ARM Linux
2009-11-09 9:51 ` Catalin Marinas
2009-11-09 10:18 ` Russell King - ARM Linux
2009-11-09 10:34 ` Catalin Marinas
2009-11-09 10:39 ` Russell King - ARM Linux
2009-11-09 10:53 ` Catalin Marinas
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=20091015122204.739.25384.stgit@pc1117.cambridge.arm.com \
--to=catalin.marinas@arm.com \
--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