lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2013-06-18 06:27:47 -10:00
parent 2601ded7fd 907985f48b
commit 4c3577c58f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mm/slab_common.c
View File

@@ -373,8 +373,10 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
{ {
int index; int index;
if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE)) if (size > KMALLOC_MAX_SIZE) {
WARN_ON_ONCE(!(flags & __GFP_NOWARN));
return NULL; return NULL;
}
if (size <= 192) { if (size <= 192) {
if (!size) if (!size)