From: Franck Bui-Huu <fbuihuu@xxxxxxxxx> For platforms that use PHYS_OFFSET and do not use a mapped kernel, this patch automatically adds PHYS_OFFSET into PAGE_OFFSET. Therefore for these platforms there are no more needs to change PAGE_OFFSET. For mapped kernel, they need to redefine PAGE_OFFSET anyways. Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx> --- Maxime, Could you give a try to this patch ? It removes the need to change your PAGE_OFFSET. If I remember correctly it's now 0x90000000, and you should be able to restore back to 0x80000000. Franck include/asm-mips/mach-generic/spaces.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-mips/mach-generic/spaces.h b/include/asm-mips/mach-generic/spaces.h index 0ae9997..600561f 100644 --- a/include/asm-mips/mach-generic/spaces.h +++ b/include/asm-mips/mach-generic/spaces.h @@ -22,7 +22,7 @@ * This handles the memory map. * We handle pages at KSEG0 for kernels with 32 bit address space. */ -#define PAGE_OFFSET 0x80000000UL +#define PAGE_OFFSET (0x80000000UL + PHYS_OFFSET) /* * Memory above this physical address will be considered highmem. @@ -39,9 +39,9 @@ * This handles the memory map. */ #ifdef CONFIG_DMA_NONCOHERENT -#define PAGE_OFFSET 0x9800000000000000UL +#define PAGE_OFFSET (0x9800000000000000UL + PHYS_OFFSET) #else -#define PAGE_OFFSET 0xa800000000000000UL +#define PAGE_OFFSET (0xa800000000000000UL + PHYS_OFFSET) #endif /* -- 1.4.4.3.ge6d4
