Commit 4c3577c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 2601ded7 907985f4

mm/slab_common.c

+3 −1
Original line number Diff line number Diff line
@@ -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)