From 1575e8588bb8e78378815a4a5b1d135f24166a3b Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Fri, 15 Feb 2008 23:45:25 -0800
Subject: [PATCH] --- yaml --- r: 86681 b: refs/heads/master c:
 27d9e4e94862c89d171cf70911b4f11ad69fb54e h: refs/heads/master i:   86679:
 671d16fbbd9ed66b34e8d908d5d0713c06815b52 v: v3

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

diff --git a/[refs] b/[refs]
index d0574ca8be0a..1c8d84378dd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d692ef6dcd20da60786470654410e85f29c2ddd9
+refs/heads/master: 27d9e4e94862c89d171cf70911b4f11ad69fb54e
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 0a5a1001590b..b49570ca08b5 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1681,8 +1681,8 @@ static __always_inline void slab_free(struct kmem_cache *s,
 	unsigned long flags;
 
 	local_irq_save(flags);
-	debug_check_no_locks_freed(object, s->objsize);
 	c = get_cpu_slab(s, smp_processor_id());
+	debug_check_no_locks_freed(object, c->objsize);
 	if (likely(page == c->page && c->node >= 0)) {
 		object[c->offset] = c->freelist;
 		c->freelist = object;