Merge branch 'topic/failslab' into for-linus
Pekka Enberg [Mon, 29 Dec 2008 09:47:05 +0000 (11:47 +0200)]
Conflicts:

mm/slub.c

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

1  2 
mm/slab.c
mm/slub.c

diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
+++ b/mm/slub.c
@@@ -1595,7 -1592,9 +1596,11 @@@ static __always_inline void *slab_alloc
        unsigned long flags;
        unsigned int objsize;
  
 +      might_sleep_if(gfpflags & __GFP_WAIT);
++
+       if (should_failslab(s->objsize, gfpflags))
+               return NULL;
        local_irq_save(flags);
        c = get_cpu_slab(s, smp_processor_id());
        objsize = c->objsize;