Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

4c3577c5 · Linus Torvalds <[email protected]> · 2013-06-18 06:27:47 -10:00

Pull SLAB fix from Pekka Enberg:
 "A slab regression fix by Sasha Levin"

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
  slab: prevent warnings when allocating with __GFP_NOWARN

Commit: 4c3577c58f7efcddeaa269e7ddbe75e8acfbb7de
Parents: 2601ded7 · 907985f4

Merge commit. Changes below are compared with the first parent: 2601ded7.

Changes

1 files changed · +3 −1

File	Status	Add	Del	Content
mm/slab_common.c	modified	+3	−1	View file

mm/slab_common.c

View file

diff --git a/mm/slab_common.c b/mm/slab_common.c
index ff3218a..2d41450 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -373,8 +373,10 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
 {
 	int index;
 
-	if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
+	if (size > KMALLOC_MAX_SIZE) {
+		WARN_ON_ONCE(!(flags & __GFP_NOWARN));
 		return NULL;
+	}
 
 	if (size <= 192) {
 		if (!size)