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();