Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  SLUB: Write to per cpu data when allocating it
  slub: Fix debugobjects with lockless fastpath

diff --git a/mm/slub.c b/mm/slub.c
index 93de30db95f5943037b1a37a9fae1e2578f06287..f881874843a5ff67a3d1cef595c35bf72a3c3565 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -849,11 +849,11 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x)
                local_irq_save(flags);
                kmemcheck_slab_free(s, x, s->objsize);
                debug_check_no_locks_freed(x, s->objsize);
-               if (!(s->flags & SLAB_DEBUG_OBJECTS))
-                       debug_check_no_obj_freed(x, s->objsize);
                local_irq_restore(flags);
        }
 #endif
+       if (!(s->flags & SLAB_DEBUG_OBJECTS))
+               debug_check_no_obj_freed(x, s->objsize);
 }
 
 /*
@@ -1604,7 +1604,7 @@ static inline void note_cmpxchg_failure(const char *n,
 
 void init_kmem_cache_cpus(struct kmem_cache *s)
 {
-#if defined(CONFIG_CMPXCHG_LOCAL) && defined(CONFIG_PREEMPT)
+#ifdef CONFIG_CMPXCHG_LOCAL
        int cpu;
 
        for_each_possible_cpu(cpu)