diff --git a/[refs] b/[refs] index 2d36de403c24..e146a11df3f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4612c8596084c898628bd1898da5987ec43ac1d +refs/heads/master: db38501511a7513ec4f0ae9922d847c135cf3c78 diff --git a/trunk/include/asm-mips/mach-generic/spaces.h b/trunk/include/asm-mips/mach-generic/spaces.h index d901e084a479..f0571b651940 100644 --- a/trunk/include/asm-mips/mach-generic/spaces.h +++ b/trunk/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 */