fix MIPS PFN/page borkage (take 2)
PATCH 1/1 fix MIPS PFN/page borkage (take 2)
The "unify PFN_* macros" patch screwed up and somehow modified the MIPS code where it shouldn't have. This backs those changes back out.
Also remember to include the new header in the MIPS files.
Signed-off-by Dave Hansen <[email protected]>
---
work-dave/arch/mips/mips-boards/generic/memory.c | 5 +++-- work-dave/arch/mips/mips-boards/sim/sim_mem.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
arch/mips/mips-boards/generic/memory.c renamed from arch/mips/mips-boards/generic/memory.c~unify_PFN_macros +3 -2
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/mm.h> #include <linux/bootmem.h> +#include <linux/pfn.h> #include <linux/string.h> #include <asm/bootinfo.h>
@@ -106,10 +107,10 @@ struct prom_pmemblock * __init prom_getm mdesc[3 ].type = yamon_dontuse; mdesc[3 ].base =0x00100000 ; - mdesc[3 ].size =CPHYSADDR (PAGE_ALIGN (&_end)) - mdesc[3 ].base; + mdesc[3 ].size =CPHYSADDR (PFN_ALIGN (&_end)) - mdesc[3 ].base; mdesc[4 ].type = yamon_free; - mdesc[4 ].base =CPHYSADDR (PAGE_ALIGN (&_end)); + mdesc[4 ].base =CPHYSADDR (PFN_ALIGN (&_end)); mdesc[4 ].size = memsize - mdesc[4 ].base;return &mdesc[0 ];
arch/mips/mips-boards/sim/sim_mem.c renamed from arch/mips/mips-boards/sim/sim_mem.c~unify_PFN_macros +3 -2
@@ -17,6 +17,7 @@*/ #include <linux/init.h> #include <linux/mm.h> +#include <linux/pfn.h> #include <linux/bootmem.h> #include <asm/bootinfo.h>
@@ -61,10 +62,10 @@ struct prom_pmemblock * __init prom_getm mdesc[2 ].type = simmem_reserved; mdesc[2 ].base =0x00100000 ; - mdesc[2 ].size =CPHYSADDR (PAGE_ALIGN (&_end)) - mdesc[2 ].base; + mdesc[2 ].size =CPHYSADDR (PFN_ALIGN (&_end)) - mdesc[2 ].base; mdesc[3 ].type = simmem_free; - mdesc[3 ].base =CPHYSADDR (PAGE_ALIGN (&_end)); + mdesc[3 ].base =CPHYSADDR (PFN_ALIGN (&_end)); mdesc[3 ].size = memsize - mdesc[3 ].base;return &mdesc[0 ];
_