diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 13:15:05 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 13:15:05 +1000 |
commit | 47a62f86c0e08ec0eaa6a66a4830027053992f96 (patch) | |
tree | 3c295857f16a40dc20ba89d4bc6f82cc0dbe1d98 /include/linux | |
parent | 357f97084585c86b2df7a5d7c940455be3d974ec (diff) | |
parent | 73367bd8eef4f4eb311005886aaa916013073265 (diff) |
Merge remote branch 'slab/for-next'
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/slub_def.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 55695c8d2f8a..6ac37664e8fe 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -75,12 +75,6 @@ struct kmem_cache { int offset; /* Free pointer offset. */ struct kmem_cache_order_objects oo; - /* - * Avoid an extra cache line for UP, SMP and for the node local to - * struct kmem_cache. - */ - struct kmem_cache_node local_node; - /* Allocation and freeing of slabs */ struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -102,6 +96,9 @@ struct kmem_cache { */ int remote_node_defrag_ratio; struct kmem_cache_node *node[MAX_NUMNODES]; +#else + /* Avoid an extra cache line for UP */ + struct kmem_cache_node local_node; #endif }; |