From 24d15207dbb557c1dd835c8c097127b5cb89b508 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 7 Mar 2009 00:36:21 +0900
Subject: [PATCH] --- yaml --- r: 135877 b: refs/heads/master c:
 1a00df4a2cc001dd9f45890e690548c24b2fa2d9 h: refs/heads/master i:   135875:
 76306d1c35505afad2f93dd021a22e2b7701bb13 v: v3

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

diff --git a/[refs] b/[refs]
index ae8219dd329f..303009a67a18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6047a007d0f6b7395cd158f3bdda34ab39a48821
+refs/heads/master: 1a00df4a2cc001dd9f45890e690548c24b2fa2d9
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index f21e25ad453b..e150b5c0424f 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -374,14 +374,8 @@ static struct track *get_track(struct kmem_cache *s, void *object,
 static void set_track(struct kmem_cache *s, void *object,
 			enum track_item alloc, unsigned long addr)
 {
-	struct track *p;
-
-	if (s->offset)
-		p = object + s->offset + sizeof(void *);
-	else
-		p = object + s->inuse;
+	struct track *p = get_track(s, object, alloc);
 
-	p += alloc;
 	if (addr) {
 		p->addr = addr;
 		p->cpu = smp_processor_id();