lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

C6X: deal with memblock API changes

Browse Source 
Recent memblock related commits require the following C6X changes:

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

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

  * commit fe091c208a
    memblock_init() no longer needed

Signed-off-by: Mark Salter <msalter@redhat.com>
This commit is contained in:
Mark Salter
2012-01-08 12:31:28 -05:00
parent 25b48ff852
commit d5981a5f16
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/c6x/include/asm/memblock.h
View File

@@ -1,4 +0,0 @@
#ifndef _ASM_C6X_MEMBLOCK_H
#define _ASM_C6X_MEMBLOCK_H
#endif /* _ASM_C6X_MEMBLOCK_H */

3
arch/c6x/kernel/setup.c
View File

@@ -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();