]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix-fix
authorAndrew Morton <akpm@linux-foundation.org>
Sat, 21 Jul 2012 00:54:04 +0000 (10:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 03:02:26 +0000 (13:02 +1000)
s/CONFIG_MEMCG_HUGETLB/CONFIG_CGROUP_HUGETLB/

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>
include/linux/hugetlb.h

index 414e8347c4c6773a6642fc9b2f9a3f70f7725b65..f9db20bfa9fc95ec46622fec5cc423a82c5958f3 100644 (file)
@@ -222,7 +222,7 @@ struct hstate {
        unsigned int nr_huge_pages_node[MAX_NUMNODES];
        unsigned int free_huge_pages_node[MAX_NUMNODES];
        unsigned int surplus_huge_pages_node[MAX_NUMNODES];
-#ifdef CONFIG_MEMCG_HUGETLB
+#ifdef CONFIG_CGROUP_HUGETLB
        /* cgroup control files */
        struct cftype cgroup_files[5];
 #endif