aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 00:54:43 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-13 00:54:43 -0400
commit17d85bc7564571a1cce23ffdb2d2a33301876925 (patch)
tree815bfc3a02e94303c7c834770bf2a17012c10bf8 /mm
parentd95c3578120e5bc4784069439f00ccb1b5f87717 (diff)
parent041b62374c7fedc11a8a1eeda2868612d3d1436c (diff)
Merge commit 'v2.6.29-rc8' into cpus4096
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,
1469 int file = is_file_lru(l); 1469 int file = is_file_lru(l);
1470 int scan; 1470 int scan;
1471 1471
1472 scan = zone_page_state(zone, NR_LRU_BASE + l); 1472 scan = zone_nr_pages(zone, sc, l);
1473 if (priority) { 1473 if (priority) {
1474 scan >>= priority; 1474 scan >>= priority;
1475 scan = (scan * percent[file]) / 100; 1475 scan = (scan * percent[file]) / 100;