Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-03-24 17:51:12 -07:00
commit a735140257
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mm/slub.c
View File

@ -849,11 +849,11 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x)
local_irq_save(flags); local_irq_save(flags);
kmemcheck_slab_free(s, x, s->objsize); kmemcheck_slab_free(s, x, s->objsize);
debug_check_no_locks_freed(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); local_irq_restore(flags);
} }
#endif #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) void init_kmem_cache_cpus(struct kmem_cache *s)
{ {
#if defined(CONFIG_CMPXCHG_LOCAL) && defined(CONFIG_PREEMPT) #ifdef CONFIG_CMPXCHG_LOCAL
int cpu; int cpu;
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)