Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / linux / hugetlb_cgroup.h

diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h
index 75e34b90074894847eb63aff72d33d2639cf7337..24154c26d469c60984020b5a0441fcb6dde3fcb0 100644 (file)
--- a/include/linux/hugetlb_cgroup.h
+++ b/include/linux/hugetlb_cgroup.h
@@ -48,9 +48,7 @@ int set_hugetlb_cgroup(struct page *page, struct hugetlb_cgroup *h_cg)
 
 static inline bool hugetlb_cgroup_disabled(void)
 {
-       if (hugetlb_cgrp_subsys.disabled)
-               return true;
-       return false;
+       return !cgroup_subsys_enabled(hugetlb_cgrp_subsys);
 }
 
 extern int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,