aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/c6x/include/asm/memblock.h4
-rw-r--r--arch/c6x/kernel/setup.c3
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/c6x/include/asm/memblock.h b/arch/c6x/include/asm/memblock.h
deleted file mode 100644
index 1181a979a82..00000000000
--- a/arch/c6x/include/asm/memblock.h
+++ /dev/null
@@ -1,4 +0,0 @@
1#ifndef _ASM_C6X_MEMBLOCK_H
2#define _ASM_C6X_MEMBLOCK_H
3
4#endif /* _ASM_C6X_MEMBLOCK_H */
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 3c2858f0d91..c126f0414be 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -305,8 +305,6 @@ void __init setup_arch(char **cmdline_p)
305 /* Initialize command line */ 305 /* Initialize command line */
306 *cmdline_p = c6x_command_line; 306 *cmdline_p = c6x_command_line;
307 307
308 memblock_init();
309
310 memory_end = ram_end; 308 memory_end = ram_end;
311 memory_end &= ~(PAGE_SIZE - 1); 309 memory_end &= ~(PAGE_SIZE - 1);
312 310
@@ -366,7 +364,6 @@ void __init setup_arch(char **cmdline_p)
366 memory_end >> PAGE_SHIFT); 364 memory_end >> PAGE_SHIFT);
367 memblock_reserve(memory_start, bootmap_size); 365 memblock_reserve(memory_start, bootmap_size);
368 366
369 memblock_analyze();
370 unflatten_device_tree(); 367 unflatten_device_tree();
371 368
372 c6x_cache_init(); 369 c6x_cache_init();