---

yaml --- r: 283194 b: refs/heads/master c: d5981a5 h: refs/heads/master v: v3
git-mirror · Jan 8, 2012 · 8205868 · 8205868
1 parent f39ec2d
commit 8205868
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25b48ff852e2e71b0d44d8ee6f69c9b704bd5070
+refs/heads/master: d5981a5f16ed8d648b7f44e4aa19cd25733518a3
diff --git a/trunk/arch/c6x/include/asm/memblock.h b/trunk/arch/c6x/include/asm/memblock.h
diff --git a/trunk/arch/c6x/kernel/setup.c b/trunk/arch/c6x/kernel/setup.c
@@ -305,8 +305,6 @@ void __init setup_arch(char **cmdline_p)
 	/* Initialize command line */
 	*cmdline_p = c6x_command_line;
 
-	memblock_init();
-
 	memory_end = ram_end;
 	memory_end &= ~(PAGE_SIZE - 1);
 
@@ -366,7 +364,6 @@ void __init setup_arch(char **cmdline_p)
 					 memory_end >> PAGE_SHIFT);
 	memblock_reserve(memory_start, bootmap_size);
 
-	memblock_analyze();
 	unflatten_device_tree();
 
 	c6x_cache_init();