diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-20 18:13:26 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-20 18:13:26 +0200 |
| commit | e8c500c2b64b6e237e67ecba7249e72363c47047 (patch) | |
| tree | e9c62e59a879ebef45b0fc2823d318b2fb2fed84 /include/linux/slub_def.h | |
| parent | c53badd0801728feedfcccae04239410b52b0d03 (diff) | |
| parent | a24c5a0ea902bcda348f086bd909cc2d6e305bf8 (diff) | |
| download | linux-e8c500c2b64b6e237e67ecba7249e72363c47047.tar.gz linux-e8c500c2b64b6e237e67ecba7249e72363c47047.tar.bz2 linux-e8c500c2b64b6e237e67ecba7249e72363c47047.zip | |
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.h | 7 |
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 { NR_SLUB_STAT_ITEMS }; struct kmem_cache_cpu { - void **freelist; /* Pointer to first free per cpu object */ + void **freelist; /* Pointer to next available object */ +#ifdef CONFIG_CMPXCHG_LOCAL + unsigned long tid; /* Globally unique transaction id */ +#endif struct page *page; /* The slab from which we are allocating */ int node; /* The node of the page (or -1 for debug) */ #ifdef CONFIG_SLUB_STATS @@ -70,6 +73,7 @@ struct kmem_cache { struct kmem_cache_cpu __percpu *cpu_slab; /* Used for retriving partial slabs etc */ unsigned long flags; + unsigned long min_partial; int size; /* The size of an object including meta data */ int objsize; /* The size of an object without meta data */ int offset; /* Free pointer offset. */ @@ -84,7 +88,6 @@ struct kmem_cache { int inuse; /* Offset to metadata */ int align; /* Alignment */ int reserved; /* Reserved bytes at the end of slabs */ - unsigned long min_partial; const char *name; /* Name (only for display!) */ struct list_head list; /* List of slab caches */ #ifdef CONFIG_SYSFS |