X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=arch%2Fmicroblaze%2Fkernel%2Fprom.c;h=80d314e81901a2d3b0c27240af5f6ff07c3d99f7;hb=1aadc0560f46530f8a0f11055285b876a8a31770;hp=977484add216913f9073841c033ed4abe5b0bd9f;hpb=1850536b93888e6cc3ee42e63e20e61f35f8b3e2;p=deliverable%2Flinux.git

diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 977484add216..80d314e81901 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -122,7 +122,6 @@ void __init early_init_devtree(void *params)
 	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);
 
 	/* Scan memory nodes and rebuild MEMBLOCKs */
-	memblock_init();
 	of_scan_flat_dt(early_init_dt_scan_root, NULL);
 	of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 
@@ -130,7 +129,7 @@ void __init early_init_devtree(void *params)
 	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
 	parse_early_param();
 
-	memblock_analyze();
+	memblock_allow_resize();
 
 	pr_debug("Phys. mem: %lx\n", (unsigned long) memblock_phys_mem_size());