From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 29 Dec 2008 09:47:05 +0000 (+0200)
Subject: Merge branch 'topic/failslab' into for-linus
X-Git-Tag: v2.6.29-rc1~565^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c506efd7e0f615bd9603ce8c06bc4a896952599;p=linux-2.6-omap-h63xx.git

Merge branch 'topic/failslab' into for-linus

Conflicts:

	mm/slub.c

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

3c506efd7e0f615bd9603ce8c06bc4a896952599
diff --cc mm/slub.c
index ca95e45f04c,640fde7e354..6cb7ad10785
--- a/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;