---

yaml --- r: 91969 b: refs/heads/master c: ad07200 h: refs/heads/master i: 91967: 703b5cc v: v3
git-mirror · Apr 24, 2008 · 3baae2f · 3baae2f
1 parent e65cd05
commit 3baae2f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b97094560b991af5c62391014e72bfa4c3a3701f
+refs/heads/master: ad072004ca35a9918964ca7aee2bf00d79c8657f
diff --git a/trunk/arch/sparc64/kernel/prom.c b/trunk/arch/sparc64/kernel/prom.c
@@ -19,8 +19,8 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/bootmem.h>
 #include <linux/module.h>
+#include <linux/lmb.h>
 
 #include <asm/prom.h>
 #include <asm/of_device.h>
@@ -122,16 +122,20 @@ int of_find_in_proplist(const char *list, const char *match, int len)
 }
 EXPORT_SYMBOL(of_find_in_proplist);
 
-static unsigned int prom_early_allocated;
+static unsigned int prom_early_allocated __initdata;
 
 static void * __init prom_early_alloc(unsigned long size)
 {
+	unsigned long paddr = lmb_alloc(size, SMP_CACHE_BYTES);
 	void *ret;
 
-	ret = __alloc_bootmem(size, SMP_CACHE_BYTES, 0UL);
-	if (ret != NULL)
-		memset(ret, 0, size);
+	if (!paddr) {
+		prom_printf("prom_early_alloc(%lu) failed\n");
+		prom_halt();
+	}
 
+	ret = __va(paddr);
+	memset(ret, 0, size);
 	prom_early_allocated += size;
 
 	return ret;

diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
@@ -1214,6 +1214,8 @@ void __init paging_init(void)
 	 */
 	real_setup_per_cpu_areas();
 
+	prom_build_devicetree();
+
 	/* Setup bootmem... */
 	pages_avail = 0;
 	last_valid_pfn = end_pfn = bootmem_init(&pages_avail, phys_base);
@@ -1222,8 +1224,6 @@ void __init paging_init(void)
 
 	kernel_physical_mapping_init();
 
-	prom_build_devicetree();
-
 	if (tlb_type == hypervisor)
 		sun4v_mdesc_init();