These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / hugetlb_cgroup.h

diff --git a/kernel/include/linux/hugetlb_cgroup.h b/kernel/include/linux/hugetlb_cgroup.h
index bcc853e..24154c2 100644 (file)
--- a/kernel/include/linux/hugetlb_cgroup.h
+++ b/kernel/include/linux/hugetlb_cgroup.h
@@ -32,7 +32,7 @@ static inline struct hugetlb_cgroup *hugetlb_cgroup_from_page(struct page *page)
 
        if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER)
                return NULL;
-       return (struct hugetlb_cgroup *)page[2].lru.next;
+       return (struct hugetlb_cgroup *)page[2].private;
 }
 
 static inline
@@ -42,15 +42,13 @@ int set_hugetlb_cgroup(struct page *page, struct hugetlb_cgroup *h_cg)
 
        if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER)
                return -1;
-       page[2].lru.next = (void *)h_cg;
+       page[2].private = (unsigned long)h_cg;
        return 0;
 }
 
 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,