From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 11 Sep 2007 07:50:40 +0000 (+0100)
Subject: [MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
X-Git-Tag: v2.6.23-rc9~22^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ae6399f0178c49a6e9cb7562ecc2f7d10c9f195;p=linux-2.6

[MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.

The __pa() for those did assume that all symbols have XKPHYS values and
the math fails for any other address range.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index b92dd8c760..e3301e54d5 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 /*
  * __pa()/__va() should be used only during mem init.
  */
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
 #define __pa(x)								\
 ({									\
     unsigned long __x = (unsigned long)(x);				\