diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-20 04:38:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-20 04:38:59 +0200 |
| commit | 14d4962dc863ab42e898d66d4837aa6c3afedc3b (patch) | |
| tree | 780cb53645b781dfd33b6d0ad21e0596f2ad1a1a /mm/memcontrol.c | |
| parent | x86: ioapic: Call free_irte only if interrupt remapping enabled (diff) | |
| parent | Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwa... (diff) | |
| download | linux-14d4962dc863ab42e898d66d4837aa6c3afedc3b.tar.xz linux-14d4962dc863ab42e898d66d4837aa6c3afedc3b.zip | |
Merge branch 'linus' into irq/core
Merge reason: update to almost-final-.36
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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: static void mem_cgroup_threshold(struct mem_cgroup *memcg) { - __mem_cgroup_threshold(memcg, false); - if (do_swap_account) - __mem_cgroup_threshold(memcg, true); + while (memcg) { + __mem_cgroup_threshold(memcg, false); + if (do_swap_account) + __mem_cgroup_threshold(memcg, true); + + memcg = parent_mem_cgroup(memcg); + } } static int compare_thresholds(const void *a, const void *b) |