diff --git a/[refs] b/[refs] index aeeea5fb7e05..f0818a2f52e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce8c2293be47999584908069e78bf6d94beadc53 +refs/heads/master: a5c96d8a1c67f31ef48935a78da2d2076513842b diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 88bc6336ce3d..c3feeaab3875 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3690,8 +3690,8 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags, * functions. */ cachep = __find_general_cachep(size, flags); - if (unlikely(cachep == NULL)) - return NULL; + if (unlikely(ZERO_OR_NULL_PTR(cachep))) + return cachep; return __cache_alloc(cachep, flags, caller); }