Fix up non-NUMA SLAB configuration for zero-sized allocations

[powerpc.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 88bc633..c3feeaa 100644 (file)
--- a/mm/slab.c
+++ b/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);
 }