[MIPS] Fixup damage done by 22a9835c350782a5c3257343713932af3ac92ee0.
authorRalf Baechle <ralf@linux-mips.org>
Mon, 3 Apr 2006 13:44:50 +0000 (14:44 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 19 Apr 2006 02:14:21 +0000 (04:14 +0200)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mips-boards/generic/memory.c
arch/mips/mips-boards/sim/sim_mem.c

index d3df1eb4b6c7e50ec8cd44ea4a39ba22bfbe0fa0..bc4d093685bbec8725ab448723700f691b8d3ac8 100644 (file)
@@ -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>
@@ -104,10 +105,10 @@ struct prom_pmemblock * __init prom_getmdesc(void)
 
        mdesc[3].type = yamon_dontuse;
        mdesc[3].base = 0x00100000;
-       mdesc[3].size = CPHYSADDR(PAGE_ALIGN((unsigned long)&_end)) - mdesc[3].base;
+       mdesc[3].size = CPHYSADDR(PFN_ALIGN((unsigned long)&_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];
index ede9c27e450bcf644ebda450541636764385a06f..f7ce769833283b38c6af2ecc8c3c24dd1db6c352 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
+#include <linux/pfn.h>
 
 #include <asm/bootinfo.h>
 #include <asm/page.h>
@@ -59,10 +60,10 @@ struct prom_pmemblock * __init prom_getmdesc(void)
 
        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];