---
 mm/slab.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.22-rc4-mm2/mm/slab.c
===================================================================
--- linux-2.6.22-rc4-mm2.orig/mm/slab.c	2007-07-03 16:02:48.000000000 -0700
+++ linux-2.6.22-rc4-mm2/mm/slab.c	2007-07-03 16:02:55.000000000 -0700
@@ -3381,7 +3381,7 @@ __cache_alloc_node(struct kmem_cache *ca
 	ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
 
 	if (unlikely((flags & __GFP_ZERO) && ptr))
-		memset(ptr, 0, cachep->buffer_size);
+		memset(ptr, 0, obj_size(cachep));
 
 	return ptr;
 }
@@ -3435,7 +3435,7 @@ __cache_alloc(struct kmem_cache *cachep,
 	prefetchw(objp);
 
 	if (unlikely((flags & __GFP_ZERO) && objp))
-		memset(objp, 0, cachep->buffer_size);
+		memset(objp, 0, obj_size(cachep));
 
 	return objp;
 }