Merge tag 'staging-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / include / linux / hugetlb_cgroup.h

diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h
index 787bba3bf5528e6679cea598c2c212c5fb108ea2..0129f89cf98de1b506452b7df8251ce0bef4f6b9 100644 (file)
--- a/include/linux/hugetlb_cgroup.h
+++ b/include/linux/hugetlb_cgroup.h
@@ -49,7 +49,7 @@ int set_hugetlb_cgroup(struct page *page, struct hugetlb_cgroup *h_cg)
 
 static inline bool hugetlb_cgroup_disabled(void)
 {
-       if (hugetlb_subsys.disabled)
+       if (hugetlb_cgrp_subsys.disabled)
                return true;
        return false;
 }