X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fsparc%2Fmm%2Finit.c;fp=arch%2Fsparc%2Fmm%2Finit.c;h=c03babaa0498b95787eac1bd3ec2244364208339;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=c85ddf31274790e6392e9d18ed6ef6c157ab71ef;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index c85ddf312..c03babaa0 100644
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -7,6 +7,7 @@
  *  Copyright (C) 2000 Anton Blanchard (anton@samba.org)
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
@@ -30,7 +31,6 @@
 #include <asm/vaddrs.h>
 #include <asm/pgalloc.h>	/* bug in asm-generic/tlb.h: check_pgt_cache */
 #include <asm/tlb.h>
-#include <asm/prom.h>
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
@@ -349,7 +349,6 @@ void __init paging_init(void)
 	protection_map[14] = PAGE_SHARED;
 	protection_map[15] = PAGE_SHARED;
 	btfixup();
-	prom_build_devicetree();
 	device_scan();
 }
 
@@ -384,7 +383,7 @@ void map_high_region(unsigned long start_pfn, unsigned long end_pfn)
 		struct page *page = pfn_to_page(tmp);
 
 		ClearPageReserved(page);
-		init_page_count(page);
+		set_page_count(page, 1);
 		__free_page(page);
 		totalhigh_pages++;
 	}
@@ -481,7 +480,7 @@ void free_initmem (void)
 		p = virt_to_page(addr);
 
 		ClearPageReserved(p);
-		init_page_count(p);
+		set_page_count(p, 1);
 		__free_page(p);
 		totalram_pages++;
 		num_physpages++;
@@ -498,7 +497,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 		struct page *p = virt_to_page(start);
 
 		ClearPageReserved(p);
-		init_page_count(p);
+		set_page_count(p, 1);
 		__free_page(p);
 		num_physpages++;
 	}