Merge tag 'nfs-for-4.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-block.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index aeb3e6d00a66be64ef522bfa63b6d2dd1c03df68..1a4ea551aae51c08fd70e4dd4693e97ca56f01de 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -565,6 +565,8 @@ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
 {
        if (size != 0 && n > SIZE_MAX / size)
                return NULL;
+       if (__builtin_constant_p(n) && __builtin_constant_p(size))
+               return kmalloc(n * size, flags);
        return __kmalloc(n * size, flags);
 }