1 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 92e10cf6d0e8..f74716b59ce2 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -16,8 +16,7 @@ struct kmem_cache_cpu {
         struct page *page;
         int node;
         unsigned int offset;
-        /* Lots of wasted space */
-} ____cacheline_aligned_in_smp;
+};
 
 struct kmem_cache_node {
         spinlock_t list_lock;   /* Protect partial list and nr_partial */
@@ -62,7 +61,11 @@ struct kmem_cache {
         int defrag_ratio;
         struct kmem_cache_node *node[MAX_NUMNODES];
 #endif
-        struct kmem_cache_cpu cpu_slab[NR_CPUS];
+#ifdef CONFIG_SMP
+        struct kmem_cache_cpu *cpu_slab[NR_CPUS];
+#else
+        struct kmem_cache_cpu cpu_slab;
+#endif
 };
 
 /*