Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

[mirror_ubuntu-zesty-kernel.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index a595dce6b0c7596d1481e2c87a2b55028c66a449..67d5d94b783a4b4ba97b53fc9d0adf9fd885af34 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -242,7 +242,7 @@ size_t ksize(const void *);
  */
 static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
 {
-       if (size != 0 && n > ULONG_MAX / size)
+       if (size != 0 && n > SIZE_MAX / size)
                return NULL;
        return __kmalloc(n * size, flags);
 }