diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /mm/memcontrol.c | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3eed583895a6..9be3cf8a5da4 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -3587,9 +3587,13 @@ unlock: | |||
| 3587 | 3587 | ||
| 3588 | static void mem_cgroup_threshold(struct mem_cgroup *memcg) | 3588 | static void mem_cgroup_threshold(struct mem_cgroup *memcg) |
| 3589 | { | 3589 | { |
| 3590 | __mem_cgroup_threshold(memcg, false); | 3590 | while (memcg) { |
| 3591 | if (do_swap_account) | 3591 | __mem_cgroup_threshold(memcg, false); |
| 3592 | __mem_cgroup_threshold(memcg, true); | 3592 | if (do_swap_account) |
| 3593 | __mem_cgroup_threshold(memcg, true); | ||
| 3594 | |||
| 3595 | memcg = parent_mem_cgroup(memcg); | ||
| 3596 | } | ||
| 3593 | } | 3597 | } |
| 3594 | 3598 | ||
| 3595 | static int compare_thresholds(const void *a, const void *b) | 3599 | static int compare_thresholds(const void *a, const void *b) |