Commit d5981a5f authored by Mark Salter's avatar Mark Salter

C6X: deal with memblock API changes

Recent memblock related commits require the following C6X changes:

  * commit 24aa0788
    asm/memblock.h no longer required

  * commit 1440c4e2
    memblock_analyze() no longer needed to update total size

  * commit fe091c20
    memblock_init() no longer needed
Signed-off-by: default avatarMark Salter <msalter@redhat.com>
parent 25b48ff8
#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) ...@@ -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) ...@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment