mm, fs: move randomize_stack_top from fs to mm

[linux.git] / mm / hugetlb_cgroup.c

diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index eec1150125b9857f3f84185d1d5beeff64ec034f..f1930fa0b445dae721d9be0139e2b2ba7119ec97 100644 (file)
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -84,7 +84,7 @@ static void hugetlb_cgroup_init(struct hugetlb_cgroup *h_cgroup,
 
                limit = round_down(PAGE_COUNTER_MAX,
                                   1 << huge_page_order(&hstates[idx]));
-               ret = page_counter_limit(counter, limit);
+               ret = page_counter_set_max(counter, limit);
                VM_BUG_ON(ret);
        }
 }
@@ -139,7 +139,7 @@ static void hugetlb_cgroup_move_parent(int idx, struct hugetlb_cgroup *h_cg,
        if (!page_hcg || page_hcg != h_cg)
                goto out;
 
-       nr_pages = 1 << compound_order(page);
+       nr_pages = compound_nr(page);
        if (!parent) {
                parent = root_h_cgroup;
                /* root has no limit */
@@ -273,7 +273,7 @@ static u64 hugetlb_cgroup_read_u64(struct cgroup_subsys_state *css,
        case RES_USAGE:
                return (u64)page_counter_read(counter) * PAGE_SIZE;
        case RES_LIMIT:
-               return (u64)counter->limit * PAGE_SIZE;
+               return (u64)counter->max * PAGE_SIZE;
        case RES_MAX_USAGE:
                return (u64)counter->watermark * PAGE_SIZE;
        case RES_FAILCNT:
@@ -306,7 +306,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of,
        switch (MEMFILE_ATTR(of_cft(of)->private)) {
        case RES_LIMIT:
                mutex_lock(&hugetlb_limit_mutex);
-               ret = page_counter_limit(&h_cg->hugepage[idx], nr_pages);
+               ret = page_counter_set_max(&h_cg->hugepage[idx], nr_pages);
                mutex_unlock(&hugetlb_limit_mutex);
                break;
        default: