diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-25 00:14:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-25 00:14:43 +0200 |
| commit | b5aef682e00c424bb2f55639168083b61803a012 (patch) | |
| tree | b7b69146e8331f96db02b766fc139d8a0907d446 /mm | |
| parent | firmware loader: fix compile warning with PM_SLEEP set (diff) | |
| parent | Linux 3.10-rc7 (diff) | |
| download | linux-b5aef682e00c424bb2f55639168083b61803a012.tar.xz linux-b5aef682e00c424bb2f55639168083b61803a012.zip | |
Merge 3.10-rc7 into driver-core-next
We want the firmware merge fixes, and other bits, in here now.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index ff3218a0f5e1..2d414508e9ec 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) |