Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

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

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index e2de77b..913c2b9 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6271,6 +6271,8 @@ static ssize_t memory_high_write(struct kernfs_open_file *of,
        if (err)
                return err;
 
+       page_counter_set_high(&memcg->memory, high);
+
        for (;;) {
                unsigned long nr_pages = page_counter_read(&memcg->memory);
                unsigned long reclaimed;
@@ -6294,10 +6296,7 @@ static ssize_t memory_high_write(struct kernfs_open_file *of,
                        break;
        }
 
-       page_counter_set_high(&memcg->memory, high);
-
        memcg_wb_domain_size_changed(memcg);
-
        return nbytes;
 }