diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 21:14:25 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 21:14:25 -0400 |
commit | 25d500067d5a666d1336598d1b324793554e5496 (patch) | |
tree | 3402308c4c69a66d02ce55f5c165e242fad2a8a9 /mm/vmscan.c | |
parent | 0b13fda1e0936b3d64c4c407f183d33fa6bd2ad4 (diff) | |
parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) |
Merge branch 'linus' into core/ipi
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 2 |
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; |