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

[deliverable/linux.git] / include / linux / slab_def.h

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index cc290f0bdb346efe82dbe0e87985e6d015ad58e1..8bb6e0eaf3c69ef19c5a2fc4810c8a558881ed5d 100644 (file)
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -81,6 +81,9 @@ struct kmem_cache {
         */
        int obj_offset;
 #endif /* CONFIG_DEBUG_SLAB */
+#ifdef CONFIG_MEMCG_KMEM
+       struct memcg_cache_params *memcg_params;
+#endif
 
 /* 6) per-cpu/per-node data, touched during every alloc/free */
        /*
@@ -89,9 +92,13 @@ struct kmem_cache {
         * (see kmem_cache_init())
         * We still use [NR_CPUS] and not [1] or [0] because cache_cache
         * is statically defined, so we reserve the max number of cpus.
+        *
+        * We also need to guarantee that the list is able to accomodate a
+        * pointer for each node since "nodelists" uses the remainder of
+        * available pointers.
         */
        struct kmem_list3 **nodelists;
-       struct array_cache *array[NR_CPUS];
+       struct array_cache *array[NR_CPUS + MAX_NUMNODES];
        /*
         * Do not add fields after array[]
         */