X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fmips-boards%2Fsim%2Fsim_mem.c;fp=arch%2Fmips%2Fmips-boards%2Fsim%2Fsim_mem.c;h=0dbd7435bb2aff83985e0ad25360d93ab13f04de;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f7ce769833283b38c6af2ecc8c3c24dd1db6c352;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/mips-boards/sim/sim_mem.c b/arch/mips/mips-boards/sim/sim_mem.c
index f7ce76983..0dbd7435b 100644
--- a/arch/mips/mips-boards/sim/sim_mem.c
+++ b/arch/mips/mips-boards/sim/sim_mem.c
@@ -18,11 +18,9 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
-#include <linux/pfn.h>
 
 #include <asm/bootinfo.h>
 #include <asm/page.h>
-#include <asm/sections.h>
 
 #include <asm/mips-boards/prom.h>
 
@@ -41,6 +39,12 @@ static char *mtypes[3] = {
 };
 #endif
 
+/* References to section boundaries */
+extern char _end;
+
+#define PFN_ALIGN(x)    (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
+
+
 struct prom_pmemblock * __init prom_getmdesc(void)
 {
 	unsigned int memsize;
@@ -113,7 +117,7 @@ unsigned long __init prom_free_prom_memory(void)
 		while (addr < boot_mem_map.map[i].addr
 			      + boot_mem_map.map[i].size) {
 			ClearPageReserved(virt_to_page(__va(addr)));
-			init_page_count(virt_to_page(__va(addr)));
+			set_page_count(virt_to_page(__va(addr)), 1);
 			free_page((unsigned long)__va(addr));
 			addr += PAGE_SIZE;
 			freed += PAGE_SIZE;