diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:00 -0700 |
| commit | 7d939fbdfee49e5c06bd27214d25f726fb87a25a (patch) | |
| tree | 8366a5e7ec36b3b0162fd54ec4b434a2b840e7ba /include | |
| parent | ptrace_signal subroutine (diff) | |
| parent | slub: No need for per node slab counters if !SLUB_DEBUG (diff) | |
| download | linux-dev-7d939fbdfee49e5c06bd27214d25f726fb87a25a.tar.xz linux-dev-7d939fbdfee49e5c06bd27214d25f726fb87a25a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: No need for per node slab counters if !SLUB_DEBUG
slub: Move map/flag clearing to __free_slab
slub: Fixes to per cpu stat output in sysfs
slub: Deal with config variable dependencies
slub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_dma near dma logic
slub: Initialize per-cpu stats
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slub_def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index b00c1c73eb0a..79d59c937fac 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -45,9 +45,9 @@ struct kmem_cache_cpu { struct kmem_cache_node { spinlock_t list_lock; /* Protect partial list and nr_partial */ unsigned long nr_partial; - atomic_long_t nr_slabs; struct list_head partial; #ifdef CONFIG_SLUB_DEBUG + atomic_long_t nr_slabs; struct list_head full; #endif }; |