diff --git a/[refs] b/[refs] index a4788f6abefc..6bd3d0d28a4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c755e9fd813810680abd56ec09a5f90143e815b +refs/heads/master: 9ca908f47bc784c90e17a553ce33e756c73feac4 diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 9aa90a6f20e0..41103910f8a2 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -180,7 +180,7 @@ size_t ksize(const void *); */ static inline void *kcalloc(size_t n, size_t size, gfp_t flags) { - if (n != 0 && size > ULONG_MAX / n) + if (size != 0 && n > ULONG_MAX / size) return NULL; return __kmalloc(n * size, flags | __GFP_ZERO); }