Merge branches 'topic/slob/cleanups', 'topic/slob/fixes', 'topic/slub/core', 'topic...
Pekka Enberg [Tue, 24 Mar 2009 08:25:21 +0000 (10:25 +0200)]
1  2  3  4  5  6 
include/linux/slub_def.h
mm/slob.c
mm/slub.c

Simple merge
diff --cc mm/slob.c
Simple merge
diff --cc 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);
      
---  -  p += 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();