Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5981a5f authored by Mark Salter's avatar Mark Salter
Browse files

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

arch/c6x/include/asm/memblock.h

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
#ifndef _ASM_C6X_MEMBLOCK_H

#define _ASM_C6X_MEMBLOCK_H



#endif /* _ASM_C6X_MEMBLOCK_H */

arch/c6x/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -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();