diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-09-11 03:50:40 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-09-27 18:19:16 -0400 |
commit | 7d809ba3f98b8aa8f9ba0dcdf6349958a0b77b7b (patch) | |
tree | 9e266ca9eb00fa349c47d52d4ca9fe3902b8feee /include/asm-mips | |
parent | 6e351064b16914e4843248355288b777fa559947 (diff) |
[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>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index b92dd8c760da..e3301e54d559 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h | |||
@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
142 | /* | 142 | /* |
143 | * __pa()/__va() should be used only during mem init. | 143 | * __pa()/__va() should be used only during mem init. |
144 | */ | 144 | */ |
145 | #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) | 145 | #ifdef CONFIG_64BIT |
146 | #define __pa(x) \ | 146 | #define __pa(x) \ |
147 | ({ \ | 147 | ({ \ |
148 | unsigned long __x = (unsigned long)(x); \ | 148 | unsigned long __x = (unsigned long)(x); \ |