aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/slub_def.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-03-20 12:13:26 -0400
committerPekka Enberg <penberg@kernel.org>2011-03-20 12:13:26 -0400
commite8c500c2b64b6e237e67ecba7249e72363c47047 (patch)
treee9c62e59a879ebef45b0fc2823d318b2fb2fed84 /include/linux/slub_def.h
parentc53badd0801728feedfcccae04239410b52b0d03 (diff)
parenta24c5a0ea902bcda348f086bd909cc2d6e305bf8 (diff)
Merge branch 'slub/lockless' into for-linus
Conflicts: include/linux/slub_def.h
Diffstat (limited to 'include/linux/slub_def.h')
-rw-r--r--include/linux/slub_def.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index ae0093cc5189..90fbb6d87e11 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -35,7 +35,10 @@ enum stat_item {
35 NR_SLUB_STAT_ITEMS }; 35 NR_SLUB_STAT_ITEMS };
36 36
37struct kmem_cache_cpu { 37struct kmem_cache_cpu {
38 void **freelist; /* Pointer to first free per cpu object */ 38 void **freelist; /* Pointer to next available object */
39#ifdef CONFIG_CMPXCHG_LOCAL
40 unsigned long tid; /* Globally unique transaction id */
41#endif
39 struct page *page; /* The slab from which we are allocating */ 42 struct page *page; /* The slab from which we are allocating */
40 int node; /* The node of the page (or -1 for debug) */ 43 int node; /* The node of the page (or -1 for debug) */
41#ifdef CONFIG_SLUB_STATS 44#ifdef CONFIG_SLUB_STATS
@@ -70,6 +73,7 @@ struct kmem_cache {
70 struct kmem_cache_cpu __percpu *cpu_slab; 73 struct kmem_cache_cpu __percpu *cpu_slab;
71 /* Used for retriving partial slabs etc */ 74 /* Used for retriving partial slabs etc */
72 unsigned long flags; 75 unsigned long flags;
76 unsigned long min_partial;
73 int size; /* The size of an object including meta data */ 77 int size; /* The size of an object including meta data */
74 int objsize; /* The size of an object without meta data */ 78 int objsize; /* The size of an object without meta data */
75 int offset; /* Free pointer offset. */ 79 int offset; /* Free pointer offset. */
@@ -84,7 +88,6 @@ struct kmem_cache {
84 int inuse; /* Offset to metadata */ 88 int inuse; /* Offset to metadata */
85 int align; /* Alignment */ 89 int align; /* Alignment */
86 int reserved; /* Reserved bytes at the end of slabs */ 90 int reserved; /* Reserved bytes at the end of slabs */
87 unsigned long min_partial;
88 const char *name; /* Name (only for display!) */ 91 const char *name; /* Name (only for display!) */
89 struct list_head list; /* List of slab caches */ 92 struct list_head list; /* List of slab caches */
90#ifdef CONFIG_SYSFS 93#ifdef CONFIG_SYSFS