diff options
| author | Mark Salter <msalter@redhat.com> | 2012-01-08 18:31:28 +0100 |
|---|---|---|
| committer | Mark Salter <msalter@redhat.com> | 2012-01-08 21:12:44 +0100 |
| commit | d5981a5f16ed8d648b7f44e4aa19cd25733518a3 (patch) | |
| tree | 62afc89db8128512abb6bf053207b61218950e9a /arch/c6x/kernel/setup.c | |
| parent | C6X: fix timer64 initialization (diff) | |
| download | linux-d5981a5f16ed8d648b7f44e4aa19cd25733518a3.tar.xz linux-d5981a5f16ed8d648b7f44e4aa19cd25733518a3.zip | |
C6X: deal with memblock API changes
Recent memblock related commits require the following C6X changes:
* commit 24aa07882b672fff2da2f5c955759f0bd13d32d5
asm/memblock.h no longer required
* commit 1440c4e2c918532f39131c3330fe2226e16be7b6
memblock_analyze() no longer needed to update total size
* commit fe091c208a40299fba40e62292a610fb91e44b4e
memblock_init() no longer needed
Signed-off-by: Mark Salter <msalter@redhat.com>
Diffstat (limited to 'arch/c6x/kernel/setup.c')
| -rw-r--r-- | arch/c6x/kernel/setup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c index 3c2858f0d91e..c126f0414be5 100644 --- 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(); |