diff options
author | Anton Blanchard <anton@samba.org> | 2014-09-17 16:15:33 +0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-10 01:59:25 +0300 |
commit | 10239733ee8617bac3f1c1769af43a88ed979324 (patch) | |
tree | c449cc34dd59b4971f6a8fd1f89c3ae6b04596d9 /arch/powerpc/kernel/setup_64.c | |
parent | 16d0f5c4af76b0c3424290937bf1ac22adf439b1 (diff) | |
download | linux-10239733ee8617bac3f1c1769af43a88ed979324.tar.xz |
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: Anton Blanchard <anton@samba.org>
Tested-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 615aa904b216..91d9cfaffe6c 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -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 |