Commit a7351402 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents b2b755b5 b8c4c96e

mm/slub.c

+3 −3
Original line number Diff line number Diff line
@@ -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)