diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 17:51:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 17:51:12 -0700 |
| commit | a7351402574eec1308b099cc8e8108e715a2c8b6 (patch) | |
| tree | 09e3c2a5f3522f4c4ed5d92c0a87ec1cf48ca443 /mm | |
| parent | b2b755b5f10eb32fbdc73a9907c07006b17f714b (diff) | |
| parent | b8c4c96ed4cdecf5ae51fc6f4c006658e873047f (diff) | |
| download | linux-3.10-a7351402574eec1308b099cc8e8108e715a2c8b6.tar.gz linux-3.10-a7351402574eec1308b099cc8e8108e715a2c8b6.tar.bz2 linux-3.10-a7351402574eec1308b099cc8e8108e715a2c8b6.zip | |
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
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c index 93de30db95f..f881874843a 100644 --- 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) |