mm/compaction: rename 'start_pfn' to 'iteration_start_pfn' in compact_zone()

[linux-2.6-microblaze.git] / mm / hugetlb_cgroup.c

diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index 1f87aec..9182848 100644 (file)
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -82,11 +82,8 @@ static inline bool hugetlb_cgroup_have_usage(struct hugetlb_cgroup *h_cg)
 
        for (idx = 0; idx < hugetlb_max_hstate; idx++) {
                if (page_counter_read(
-                           hugetlb_cgroup_counter_from_cgroup(h_cg, idx)) ||
-                   page_counter_read(hugetlb_cgroup_counter_from_cgroup_rsvd(
-                           h_cg, idx))) {
+                               hugetlb_cgroup_counter_from_cgroup(h_cg, idx)))
                        return true;
-               }
        }
        return false;
 }
@@ -202,9 +199,10 @@ static void hugetlb_cgroup_css_offline(struct cgroup_subsys_state *css)
        struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(css);
        struct hstate *h;
        struct page *page;
-       int idx = 0;
+       int idx;
 
        do {
+               idx = 0;
                for_each_hstate(h) {
                        spin_lock(&hugetlb_lock);
                        list_for_each_entry(page, &h->hugepage_activelist, lru)