C6X: deal with memblock API changes
Recent memblock related commits require the following C6X changes: * commit24aa07882b
asm/memblock.h no longer required * commit1440c4e2c9
memblock_analyze() no longer needed to update total size * commitfe091c208a
memblock_init() no longer needed Signed-off-by: Mark Salter <msalter@redhat.com>
This commit is contained in:
parent
25b48ff852
commit
d5981a5f16
|
@ -1,4 +0,0 @@
|
||||||
#ifndef _ASM_C6X_MEMBLOCK_H
|
|
||||||
#define _ASM_C6X_MEMBLOCK_H
|
|
||||||
|
|
||||||
#endif /* _ASM_C6X_MEMBLOCK_H */
|
|
|
@ -305,8 +305,6 @@ void __init setup_arch(char **cmdline_p)
|
||||||
/* Initialize command line */
|
/* Initialize command line */
|
||||||
*cmdline_p = c6x_command_line;
|
*cmdline_p = c6x_command_line;
|
||||||
|
|
||||||
memblock_init();
|
|
||||||
|
|
||||||
memory_end = ram_end;
|
memory_end = ram_end;
|
||||||
memory_end &= ~(PAGE_SIZE - 1);
|
memory_end &= ~(PAGE_SIZE - 1);
|
||||||
|
|
||||||
|
@ -366,7 +364,6 @@ void __init setup_arch(char **cmdline_p)
|
||||||
memory_end >> PAGE_SHIFT);
|
memory_end >> PAGE_SHIFT);
|
||||||
memblock_reserve(memory_start, bootmap_size);
|
memblock_reserve(memory_start, bootmap_size);
|
||||||
|
|
||||||
memblock_analyze();
|
|
||||||
unflatten_device_tree();
|
unflatten_device_tree();
|
||||||
|
|
||||||
c6x_cache_init();
|
c6x_cache_init();
|
||||||
|
|
Loading…
Reference in New Issue