diff options
-rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ea1e879b2db6..a7165a60d0a7 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -3763,7 +3763,7 @@ move_account: | |||
3763 | goto try_to_free; | 3763 | goto try_to_free; |
3764 | cond_resched(); | 3764 | cond_resched(); |
3765 | /* "ret" should also be checked to ensure all lists are empty. */ | 3765 | /* "ret" should also be checked to ensure all lists are empty. */ |
3766 | } while (memcg->res.usage > 0 || ret); | 3766 | } while (res_counter_read_u64(&memcg->res, RES_USAGE) > 0 || ret); |
3767 | out: | 3767 | out: |
3768 | css_put(&memcg->css); | 3768 | css_put(&memcg->css); |
3769 | return ret; | 3769 | return ret; |
@@ -3778,7 +3778,7 @@ try_to_free: | |||
3778 | lru_add_drain_all(); | 3778 | lru_add_drain_all(); |
3779 | /* try to free all pages in this cgroup */ | 3779 | /* try to free all pages in this cgroup */ |
3780 | shrink = 1; | 3780 | shrink = 1; |
3781 | while (nr_retries && memcg->res.usage > 0) { | 3781 | while (nr_retries && res_counter_read_u64(&memcg->res, RES_USAGE) > 0) { |
3782 | int progress; | 3782 | int progress; |
3783 | 3783 | ||
3784 | if (signal_pending(current)) { | 3784 | if (signal_pending(current)) { |