commit db38501511a7513ec4f0ae9922d847c135cf3c78
author Franck Bui-Huu <fbuihuu@gmail.com> Mon Jun 04 17:46:33 2007 +0200
committer Ralf Baechle <ralf@linux-mips.org> Tue Jul 10 17:32:57 2007 +0100
tree 4f951e755c4084c6097ae81dce15a4b6b9c9c947
parent c4612c8596084c898628bd1898da5987ec43ac1d

[MIPS] Make PAGE_OFFSET aware of PHYS_OFFSET

For platforms that use PHYS_OFFSET and do not use a mapped kernel,
this patch automatically adds PHYS_OFFSET into PAGE_OFFSET.
Therefore there are no more needs for them to redefine PAGE_OFFSET.

For mapped kernel, they need to redefine PAGE_OFFSET anyways.

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

include/asm-mips/mach-generic/spaces.h

diff --git a/include/asm-mips/mach-generic/spaces.h b/include/asm-mips/mach-generic/spaces.h
index d901e08..f0571b65 100644
--- a/include/asm-mips/mach-generic/spaces.h
+++ b/include/asm-mips/mach-generic/spaces.h
@@ -72,7 +72,7 @@
  * This handles the memory map.
  */
 #ifndef PAGE_OFFSET
-#define PAGE_OFFSET		CAC_BASE
+#define PAGE_OFFSET		(CAC_BASE + PHYS_OFFSET)
 #endif
 
 #endif /* __ASM_MACH_GENERIC_SPACES_H */