Merge tag 'drm-next-2019-01-05' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 623e8a5c46ce632d452e1863e65467cbfb878832..307c2c9feb441d99789f031b9bdc6eaf46234618 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -555,8 +555,10 @@ static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
                                            flags, node);
        }
 
-       if (b && c->ctor)
+       if (b && c->ctor) {
+               WARN_ON_ONCE(flags & __GFP_ZERO);
                c->ctor(b);
+       }
 
        kmemleak_alloc_recursive(b, c->size, 1, c->flags, flags);
        return b;