[PATCH] powerpc: don't pass GFP_WAIT to kmalloc() from *_maybe_bootmem()

From: Pekka J Enberg
Date: Fri Jun 12 2009 - 05:22:43 EST

From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>

As slab is initialized much earlier now, we must not pass GFP_WAIT to kmalloc()
from *_maybe_bootmem() functions; otherwise slab allocators will enable

Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Ben, while we're discussing the slab side of things, can we go ahead and
merge this one? It should fix plenty of cases for powerpc.

arch/powerpc/lib/alloc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c
index f53e09c..56b35e3 100644
--- a/arch/powerpc/lib/alloc.c
+++ b/arch/powerpc/lib/alloc.c
@@ -9,7 +9,7 @@
void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
if (mem_init_done)
- return kmalloc(size, mask);
+ return kmalloc(size, mask & ~__GFP_WAIT);
return alloc_bootmem(size);
@@ -19,7 +19,7 @@ void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
void *p;

if (mem_init_done)
- p = kzalloc(size, mask);
+ p = kzalloc(size, mask & ~__GFP_WAIT);
else {
p = alloc_bootmem(size);
if (p)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/