Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / include / linux / slub_def.h

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index a6c43ec6a4a590585ab29474fe0bfb7c9a8aa6b1..e4f5ed180b9bbe226714f2b40fd0d95516ad3c12 100644 (file)
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -87,7 +87,7 @@ struct kmem_cache {
        unsigned long min_partial;
        const char *name;       /* Name (only for display!) */
        struct list_head list;  /* List of slab caches */
-#ifdef CONFIG_SLUB_DEBUG
+#ifdef CONFIG_SYSFS
        struct kobject kobj;    /* For sysfs */
 #endif
 
@@ -96,11 +96,8 @@ struct kmem_cache {
         * Defragmentation by allocating from a remote node.
         */
        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
+       struct kmem_cache_node *node[MAX_NUMNODES];
 };
 
 /*