tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds a7351402 b2b755b5

+3 -3
unified split
+3 -3
mm/slub.c
··· 849 local_irq_save(flags); 850 kmemcheck_slab_free(s, x, s->objsize); 851 debug_check_no_locks_freed(x, s->objsize); 852 - if (!(s->flags & SLAB_DEBUG_OBJECTS)) 853 - debug_check_no_obj_freed(x, s->objsize); 854 local_irq_restore(flags); 855 } 856 #endif 857 } 858 859 /* ··· 1604 1605 void init_kmem_cache_cpus(struct kmem_cache *s) 1606 { 1607 - #if defined(CONFIG_CMPXCHG_LOCAL) && defined(CONFIG_PREEMPT) 1608 int cpu; 1609 1610 for_each_possible_cpu(cpu)
··· 849 local_irq_save(flags); 850 kmemcheck_slab_free(s, x, s->objsize); 851 debug_check_no_locks_freed(x, s->objsize); 852 local_irq_restore(flags); 853 } 854 #endif 855 + if (!(s->flags & SLAB_DEBUG_OBJECTS)) 856 + debug_check_no_obj_freed(x, s->objsize); 857 } 858 859 /* ··· 1604 1605 void init_kmem_cache_cpus(struct kmem_cache *s) 1606 { 1607 + #ifdef CONFIG_CMPXCHG_LOCAL 1608 int cpu; 1609 1610 for_each_possible_cpu(cpu)