Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub...

[linux.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 10249160b693dd63d4322665fee01f64de5475e3..623e8a5c46ce632d452e1863e65467cbfb878832 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -330,7 +330,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
                BUG_ON(!b);
                spin_unlock_irqrestore(&slob_lock, flags);
        }
-       if (unlikely((gfp & __GFP_ZERO) && b))
+       if (unlikely(gfp & __GFP_ZERO))
                memset(b, 0, size);
        return b;
 }
@@ -524,7 +524,7 @@ size_t ksize(const void *block)
 }
 EXPORT_SYMBOL(ksize);
 
-int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
+int __kmem_cache_create(struct kmem_cache *c, slab_flags_t flags)
 {
        if (flags & SLAB_TYPESAFE_BY_RCU) {
                /* leave room for rcu footer at the end of object */