C6X: deal with memblock API changes

Recent memblock related commits require the following C6X changes: * commit 24aa078 asm/memblock.h no longer required * commit 1440c4e memblock_analyze() no longer needed to update total size * commit fe091c2 memblock_init() no longer needed Signed-off-by: Mark Salter <msalter@redhat.com>
mariux64 · Jan 8, 2012 · d5981a5 · d5981a5
1 parent 25b48ff
commit d5981a5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/arch/c6x/include/asm/memblock.h b/arch/c6x/include/asm/memblock.h
diff --git a/arch/c6x/kernel/setup.c b/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();