[<prev] [next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.0906102056530.28361@melkki.cs.Helsinki.FI>
Date: Wed, 10 Jun 2009 20:57:21 +0300 (EEST)
From: Pekka J Enberg <penberg@...helsinki.fi>
To: linux-kernel@...r.kernel.org, linux-mm@...ck.org
cc: cl@...ux-foundation.com, mingo@...e.hu, hannes@...xchg.org,
torvalds@...ux-foundation.org, mpm@...enic.com, npiggin@...e.de,
yinghai@...nel.org
Subject: [PATCH 1/3] bootmem: use slab if bootmem is no longer available
From: Pekka Enberg <penberg@...helsinki.fi>
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.
Cc: Christoph Lameter <cl@...ux-foundation.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Matt Mackall <mpm@...enic.com>
Cc: Nick Piggin <npiggin@...e.de>
Cc: Yinghai Lu <yinghai@...nel.org>
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
---
mm/bootmem.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/mm/bootmem.c b/mm/bootmem.c
index daf9271..457269c 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);
+
#ifdef CONFIG_HAVE_ARCH_BOOTMEM
bootmem_data_t *p_bdata;
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists