aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 12:46:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 12:46:17 -0700
commit3b03117c5cfbb04175b688c79ea4155b8ef812d3 (patch)
tree5d2e3d0d7db98e2b47c7bb51be39bc4ced6a4d97 /include
parentfa7eadab4b4aec0139d2429e6f8d13375ff8a658 (diff)
parent0f1f694260e0d35b5ce7d471f6e679c3dd4d7d94 (diff)
downloadkernel_samsung_smdk4412-3b03117c5cfbb04175b688c79ea4155b8ef812d3.zip
kernel_samsung_smdk4412-3b03117c5cfbb04175b688c79ea4155b8ef812d3.tar.gz
kernel_samsung_smdk4412-3b03117c5cfbb04175b688c79ea4155b8ef812d3.tar.bz2
Merge branch 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Allow full duplication of kmalloc array for 390 slub: move kmem_cache_node into it's own cacheline
Diffstat (limited to 'include')
-rw-r--r--include/linux/slub_def.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 55695c8..4ba59cf 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
};
@@ -140,7 +137,7 @@ struct kmem_cache {
#ifdef CONFIG_ZONE_DMA
#define SLUB_DMA __GFP_DMA
/* Reserve extra caches for potential DMA use */
-#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT - 6)
+#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT)
#else
/* Disable DMA functionality */
#define SLUB_DMA (__force gfp_t)0