diff --git a/[refs] b/[refs] index 3a2d18ca50b3..0c68fc58329d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a482289d46587ffcda4c85aab109fb74910d7a48 +refs/heads/master: b50ec7d8070ae7a39fe78e65a8812bbc3ca2f7ac diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 8cf52939d0ab..38bed95dda7a 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -118,7 +118,7 @@ extern void *kzalloc(size_t, gfp_t); */ static inline void *kcalloc(size_t n, size_t size, gfp_t flags) { - if (n != 0 && size > INT_MAX / n) + if (n != 0 && size > ULONG_MAX / n) return NULL; return kzalloc(n * size, flags); }