path: root/mm/bootmem.c
diff options
authorPekka Enberg <penberg@cs.helsinki.fi>2009-06-10 20:05:53 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2009-06-11 19:10:41 +0300
commit441c7e0a2ed38827b48b907bd1fa29faba2017a3 (patch)
tree7e614a14e34a39a63520600b810319da9f0f98ca /mm/bootmem.c
parent991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff)
bootmem: use slab if bootmem is no longer available
As a preparation for initializing the slab allocator early, make sure the bootmem allocator does not crash and burn if someone calls it after slab is up; otherwise we'd need a flag day for switching to early slab. Acked-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Matt Mackall <mpm@selenic.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm/bootmem.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index daf92713f7d..457269c73e8 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -532,6 +532,9 @@ static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata,
unsigned long size, unsigned long align,
unsigned long goal, unsigned long limit)
+ if (WARN_ON_ONCE(slab_is_available()))
+ return kzalloc(size, GFP_NOWAIT);
bootmem_data_t *p_bdata;