From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Tue, 24 Mar 2009 08:25:21 +0000 (+0200)
Subject: Merge branches 'topic/slob/cleanups', 'topic/slob/fixes', 'topic/slub/core', 'topic... 
X-Git-Tag: v2.6.30-rc1~652^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15a5b0a4912d98a9615ef457c7bde8d08195a771;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branches 'topic/slob/cleanups', 'topic/slob/fixes', 'topic/slub/core', 'topic/slub/cleanups' and 'topic/slub/perf' into for-linus
---

15a5b0a4912d98a9615ef457c7bde8d08195a771
diff --cc mm/slub.c
index 0280eee,6392ae5,bdc9abb,77268d1,e150b5c,c01a7a3..c65a4ed
--- a/mm/slub.c
+++ b/mm/slub.c
@@@@@@@ -374,14 -374,14 -374,14 -374,14 -374,8 -374,14 +374,8 @@@@@@@ static struct track *get_track(struct k
      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);
      
   -  	if (s->offset)
   -  		p = object + s->offset + sizeof(void *);
   -  	else
   -  		p = object + s->inuse;
   -  
---- -	p += alloc;
      	if (addr) {
      		p->addr = addr;
      		p->cpu = smp_processor_id();