mm-hugetlb-add-new-hugetlb-cgroup-fix

s/CONFIG_CGROUP_HUGETLB_RES_CTLR/CONFIG_MEMCG_HUGETLB/g

Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 895923a7fcec619c8cff00a2b76d314628f6c71f..c22f4762c661e320911bfe12ad8ca3363f6b6032 100644 (file)
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -73,7 +73,7 @@ SUBSYS(net_prio)
 
 /* */
 
-#ifdef CONFIG_CGROUP_HUGETLB_RES_CTLR
+#ifdef CONFIG_MEMCG_HUGETLB
 SUBSYS(hugetlb)
 #endif
 

diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h
index e9944b459259aa58b81fc09be0aded342e64c495..b20bdf2061e616bfa8a4037a8a2ed00c055aff5a 100644 (file)
--- a/include/linux/hugetlb_cgroup.h
+++ b/include/linux/hugetlb_cgroup.h
@@ -19,7 +19,7 @@
 
 struct hugetlb_cgroup;
 
-#ifdef CONFIG_CGROUP_HUGETLB_RES_CTLR
+#ifdef CONFIG_MEMCG_HUGETLB
 static inline bool hugetlb_cgroup_disabled(void)
 {
        if (hugetlb_subsys.disabled)

diff --git a/init/Kconfig b/init/Kconfig
index cd24b0c1171ad8d7ba9473f9cc594aeff9b65ab3..ce7973073eff8c8f67829334a4c565a43c3029df 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -751,7 +751,7 @@ config CGROUP_MEM_RES_CTLR_KMEM
          the kmem extension can use it to guarantee that no group of processes
          will ever exhaust kernel resources alone.
 
-config CGROUP_HUGETLB_RES_CTLR
+config MEMCG_HUGETLB
        bool "HugeTLB Resource Controller for Control Groups"
        depends on RESOURCE_COUNTERS && HUGETLB_PAGE && EXPERIMENTAL
        default n

diff --git a/mm/Makefile b/mm/Makefile
index 2bebede92f79ff207119288d3f765c78f6877f78..560434ce40b69cec3a5edf75c33b963b32c8a217 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -50,7 +50,7 @@ obj-$(CONFIG_MIGRATION) += migrate.o
 obj-$(CONFIG_QUICKLIST) += quicklist.o
 obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o
 obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
-obj-$(CONFIG_CGROUP_HUGETLB_RES_CTLR) += hugetlb_cgroup.o
+obj-$(CONFIG_MEMCG_HUGETLB) += hugetlb_cgroup.o
 obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o
 obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o
 obj-$(CONFIG_DEBUG_KMEMLEAK) += kmemleak.o