From e5ca9c2bfc780becf3f3f16590e52105bd0525e5 Mon Sep 17 00:00:00 2001
From: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Date: Thu, 10 Jul 2008 22:21:58 +0200
Subject: [PATCH] --- yaml --- r: 98815 b: refs/heads/master c:
 bdb21928512a860a60e6a24a849dc5b63cbaf96a h: refs/heads/master i:   98813:
 57f304c4f5acf20404de38b852741f76f89c62a0   98811:
 cfa7720f20ae1c59c6e67359835daa549ae42141   98807:
 1ad2ee3d00bef086d6756cca0bfe77a2155bbe6e   98799:
 10b0c615fc20ff61c940465d32302773415f9a84   98783:
 8e5cad9091f73f95785fd54368411d63cbfec99a   98751:
 9b6ab531858028b4ede462f41992a61be49b0c17   98687:
 116eb12d572e27c75a1b95ceb9dcb16aa254e41a   98559:
 b15503f810033a52fbb31252e24db2465ebe15db   98303:
 8d3fd52306c01a77327e5a8547cc363fa60bb45f v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4435f2c4cd50..5efb3a989d23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a8e13ed44e380fc2bb6c711d74d5ba698c00b2
+refs/heads/master: bdb21928512a860a60e6a24a849dc5b63cbaf96a
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 1a427c0ae83b..315c392253c7 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1628,9 +1628,11 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
 	void **object;
 	struct kmem_cache_cpu *c;
 	unsigned long flags;
+	unsigned int objsize;
 
 	local_irq_save(flags);
 	c = get_cpu_slab(s, smp_processor_id());
+	objsize = c->objsize;
 	if (unlikely(!c->freelist || !node_match(c, node)))
 
 		object = __slab_alloc(s, gfpflags, node, addr, c);
@@ -1643,7 +1645,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
 	local_irq_restore(flags);
 
 	if (unlikely((gfpflags & __GFP_ZERO) && object))
-		memset(object, 0, c->objsize);
+		memset(object, 0, objsize);
 
 	return object;
 }