summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2009-03-12 14:31:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-12 16:20:24 -0700
commitf272b7bc447553410dde691aa31fc531adf9c175 (patch)
tree95bd28ba8cea8471c0f461cfe6a9f2f0c2f00dff /mm
parent02d46e07e538c285accb5c000a7db3a97eff1fbf (diff)
downloadlinux-stable-f272b7bc447553410dde691aa31fc531adf9c175.tar.gz
linux-stable-f272b7bc447553410dde691aa31fc531adf9c175.tar.bz2
linux-stable-f272b7bc447553410dde691aa31fc531adf9c175.zip
memcg: use correct scan number at reclaim
Even when page reclaim is under mem_cgroup, # of scan page is determined by status of global LRU. Fix that. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Balbir Singh <balbir@in.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 6177e3bcd66b..e89517141657 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1469,7 +1469,7 @@ static void shrink_zone(int priority, struct zone *zone,
int file = is_file_lru(l);
int scan;
- scan = zone_page_state(zone, NR_LRU_BASE + l);
+ scan = zone_nr_pages(zone, sc, l);
if (priority) {
scan >>= priority;
scan = (scan * percent[file]) / 100;