From 80500c97a051b808ed7d9d63640a20b0b334d47c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 15 Jan 2009 13:51:21 -0800
Subject: [PATCH] --- yaml --- r: 129694 b: refs/heads/master c:
 5b019e99016f3a692ba45bf68fba73a402d7c01a h: refs/heads/master v: v3

---
 [refs]          |  2 +-
 trunk/lib/idr.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index cab9156672bc..a775c952101e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5da7f3d71e243ef5c464967581414d29c72bab75
+refs/heads/master: 5b019e99016f3a692ba45bf68fba73a402d7c01a
diff --git a/trunk/lib/idr.c b/trunk/lib/idr.c
index 6b7cfa6508fe..c11c5765cdef 100644
--- a/trunk/lib/idr.c
+++ b/trunk/lib/idr.c
@@ -121,7 +121,7 @@ int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
 {
 	while (idp->id_free_cnt < IDR_FREE_MAX) {
 		struct idr_layer *new;
-		new = kmem_cache_alloc(idr_layer_cache, gfp_mask);
+		new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
 		if (new == NULL)
 			return (0);
 		move_to_free_list(idp, new);
@@ -623,16 +623,10 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 }
 EXPORT_SYMBOL(idr_replace);
 
-static void idr_cache_ctor(void *idr_layer)
-{
-	memset(idr_layer, 0, sizeof(struct idr_layer));
-}
-
 void __init idr_init_cache(void)
 {
 	idr_layer_cache = kmem_cache_create("idr_layer_cache",
-				sizeof(struct idr_layer), 0, SLAB_PANIC,
-				idr_cache_ctor);
+				sizeof(struct idr_layer), 0, SLAB_PANIC, NULL);
 }
 
 /**