From c44664e67cb64396d940cce0100fef8fee9f9f98 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 22 Mar 2006 00:08:09 -0800
Subject: [PATCH] --- yaml --- r: 22449 b: refs/heads/master c:
 b50ec7d8070ae7a39fe78e65a8812bbc3ca2f7ac h: refs/heads/master i:   22447:
 320bde9a0c9cff6652f6a0182084cd735abb8f31 v: v3

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

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