diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:42 +0200 |
| commit | 436281c9a110ff16c1fb396add5dd944ee92cf36 (patch) | |
| tree | afda86db9e89d41ca49a8311673b994a82d16d42 /mm/vmscan.c | |
| parent | Merge branch 'tip/sched/core' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | IA32 emulation: Fix build problem for modular ia32 a.out support (diff) | |
| download | linux-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.xz linux-436281c9a110ff16c1fb396add5dd944ee92cf36.zip | |
Merge branch 'linus' into sched/core
Merge reason: We were on a pretty old base, refresh before moving on.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 1a518684a32f..33dc256033b5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1568,9 +1568,14 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, reclaim_stat->recent_scanned[0] += nr_anon; reclaim_stat->recent_scanned[1] += nr_file; - if (current_is_kswapd()) - __count_vm_events(KSWAPD_STEAL, nr_reclaimed); - __count_zone_vm_events(PGSTEAL, zone, nr_reclaimed); + if (global_reclaim(sc)) { + if (current_is_kswapd()) + __count_zone_vm_events(PGSTEAL_KSWAPD, zone, + nr_reclaimed); + else + __count_zone_vm_events(PGSTEAL_DIRECT, zone, + nr_reclaimed); + } putback_inactive_pages(mz, &page_list); |