]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
slub: Add might_sleep_if() to slab_alloc()
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Wed, 19 Nov 2008 12:23:59 +0000 (21:23 +0900)
committerPekka Enberg <penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:40:51 +0000 (11:40 +0200)
Currently SLUB doesn't warn about __GFP_WAIT. Add it into slab_alloc().

Acked-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
mm/slub.c

index a2cd47d89e0aa1f159d8e9e6ed2dcee32969068f..704cfa34f9abe93f9a602b331024ab7169e73733 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1591,6 +1591,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
        unsigned long flags;
        unsigned int objsize;
 
+       might_sleep_if(gfpflags & __GFP_WAIT);
        local_irq_save(flags);
        c = get_cpu_slab(s, smp_processor_id());
        objsize = c->objsize;