summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/setup.h
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-09-17 22:15:33 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2014-11-10 09:59:25 +1100
commit10239733ee8617bac3f1c1769af43a88ed979324 (patch)
treec449cc34dd59b4971f6a8fd1f89c3ae6b04596d9 /arch/powerpc/include/asm/setup.h
parent16d0f5c4af76b0c3424290937bf1ac22adf439b1 (diff)
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/include/asm/setup.h')
-rw-r--r--arch/powerpc/include/asm/setup.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index 11ba86e17631..fbdf18cf954c 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -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