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

Commit 10239733 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Remove bootmem allocator 



At the moment we transition from the memblock alloctor to the bootmem
allocator. Gitting rid of the bootmem allocator removes a bunch of
complicated code (most of which I owe the dubious honour of being
responsible for writing).

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Tested-by: default avatarEmil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 16d0f5c4

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ config PPC 
	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW

	select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN

	select NO_BOOTMEM



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN

arch/powerpc/include/asm/setup.h

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ extern void ppc_printk_progress(char *s, unsigned short hex); 


extern unsigned int rtas_data;

extern int mem_init_done;	/* set on boot once kmalloc can be called */

extern int init_bootmem_done;	/* set once bootmem is available */

extern unsigned long long memory_limit;

extern unsigned long klimit;

extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
@@ -24,7 +23,7 @@ extern void reloc_got2(unsigned long); 
#define PTRRELOC(x)	((typeof(x)) add_reloc_offset((unsigned long)(x)))



void check_for_initrd(void);

void do_init_bootmem(void);

void initmem_init(void);

void setup_panic(void);

#define ARCH_PANIC_TIMEOUT 180

arch/powerpc/kernel/setup_32.c

+2 −3
Original line number Diff line number Diff line
@@ -311,9 +311,8 @@ void __init setup_arch(char **cmdline_p) 


	irqstack_early_init();



	/* set up the bootmem stuff with available memory */

	do_init_bootmem();

	if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);

	initmem_init();

	if ( ppc_md.progress ) ppc_md.progress("setup_arch: initmem", 0x3eab);



#ifdef CONFIG_DUMMY_CONSOLE

	conswitchp = &dummy_con;

arch/powerpc/kernel/setup_64.c

+1 −2
Original line number Diff line number Diff line
@@ -689,8 +689,7 @@ void __init setup_arch(char **cmdline_p) 
	exc_lvl_early_init();

	emergency_stack_init();



	/* set up the bootmem stuff with available memory */

	do_init_bootmem();

	initmem_init();

	sparse_init();



#ifdef CONFIG_DUMMY_CONSOLE

arch/powerpc/mm/init_32.c

+0 −9
Original line number Diff line number Diff line
@@ -195,15 +195,6 @@ void __init MMU_init(void) 
	memblock_set_current_limit(lowmem_end_addr);

}



/* This is only called until mem_init is done. */

void __init *early_get_page(void)

{

	if (init_bootmem_done)

		return alloc_bootmem_pages(PAGE_SIZE);

	else

		return __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));

}



#ifdef CONFIG_8xx /* No 8xx specific .c file to put that in ... */

void setup_initial_memory_limit(phys_addr_t first_memblock_base,

				phys_addr_t first_memblock_size)