Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / slab_def.h

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index b869d16..33d0490 100644 (file)
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -70,7 +70,7 @@ struct kmem_cache {
        int obj_offset;
 #endif /* CONFIG_DEBUG_SLAB */
 #ifdef CONFIG_MEMCG_KMEM
-       struct memcg_cache_params *memcg_params;
+       struct memcg_cache_params memcg_params;
 #endif
 
        struct kmem_cache_node *node[MAX_NUMNODES];