From c19fbb64f6d88d8d326bcc8787116a6f3d3554c3 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Wed, 23 Jul 2008 21:28:20 -0700
Subject: [PATCH] --- yaml --- r: 105345 b: refs/heads/master c:
 9ca908f47bc784c90e17a553ce33e756c73feac4 h: refs/heads/master i:   105343:
 11d0fd92e355e186cea7ea855195a8a8e4ec2218 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/slab.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);
 }