diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-09 19:21:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-09 19:21:33 -0400 |
| commit | 4fbb71597af591fa0ef565df1ba745c92d5070f7 (patch) | |
| tree | dcfdfa866e2ad3a14992b5a1fe6cd19711d5efab /include | |
| parent | e6ca23289f865f0372b89f42884c258a8e85460b (diff) | |
| parent | 5595cffc8248e4672c5803547445e85e4053c8fc (diff) | |
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: dynamic per-cache MIN_PARTIAL
mm: unexport ksize
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slub_def.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 5bad61a93f65..2f5c16b1aacd 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h | |||
| @@ -46,6 +46,7 @@ struct kmem_cache_cpu { | |||
| 46 | struct kmem_cache_node { | 46 | struct kmem_cache_node { |
| 47 | spinlock_t list_lock; /* Protect partial list and nr_partial */ | 47 | spinlock_t list_lock; /* Protect partial list and nr_partial */ |
| 48 | unsigned long nr_partial; | 48 | unsigned long nr_partial; |
| 49 | unsigned long min_partial; | ||
| 49 | struct list_head partial; | 50 | struct list_head partial; |
| 50 | #ifdef CONFIG_SLUB_DEBUG | 51 | #ifdef CONFIG_SLUB_DEBUG |
| 51 | atomic_long_t nr_slabs; | 52 | atomic_long_t nr_slabs; |