Commit:     b1c65b3988c6e29ac371ab1cbbf6c4f8fb7092f8
Parent:     41b0483ee54d89f9ad068ceae3c91cdc7594d050
Author:     Franck Bui-Huu <[EMAIL PROTECTED]>
AuthorDate: Mon Jun 4 17:46:35 2007 +0200
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 17:32:57 2007 +0100

    [MIPS] Fix PHYS_OFFSET for 64-bits kernels with 32-bits symbols
    The current implementation of __pa() for 64-bits kernels with 32-bits
    symbols is broken. In this configuration, we need 2 values for
    PAGE_OFFSET, one in XKPHYS and the other in CKSEG0 space.
    When the value in CKSEG0 space is used, it doesn't take into account
    of PHYS_OFFSET. Even worse we can't redefine this value.
    The patch restores CPHYSADDR() but in __pa()'s implementation because
    it removes the need of 2 PAGE_OFFSET.
    OTOH, CPHYSADDR() is quite bad when dealing with mapped kernels. So
    this patch assumes there's no need to deal with such kernel in 64-bits
    Signed-off-by: Franck Bui-Huu <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
 include/asm-mips/page.h |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index c56c6a8..b92dd8c 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -35,7 +35,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/pfn.h>
-#include <linux/io.h>
+#include <asm/io.h>
  * It's normally defined only for FLATMEM config but it's
@@ -143,11 +143,15 @@ typedef struct { unsigned long pgprot; } pgprot_t;
  * __pa()/__va() should be used only during mem init.
 #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-#define __pa_page_offset(x)    ((unsigned long)(x) < CKSEG0 ? PAGE_OFFSET : 
+#define __pa(x)                                                                
+({                                                                     \
+    unsigned long __x = (unsigned long)(x);                            \
+    __x < CKSEG0 ? XPHYSADDR(__x) : CPHYSADDR(__x);                    \
-#define __pa_page_offset(x)    PAGE_OFFSET
+#define __pa(x)                                                                
+    ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
-#define __pa(x)                ((unsigned long)(x) - __pa_page_offset(x) + 
 #define __va(x)                ((void *)((unsigned long)(x) + PAGE_OFFSET - 
 #define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0))
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to