diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
| commit | 3c1f67d60e2b4f4455563928999fd41cc653645d (patch) | |
| tree | 0d58c145a05fb09167f1ab6882b474eccb1f3563 /mm | |
| parent | 03d78913f01e8f6599823f00357ed17b32747d3d (diff) | |
| parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
| download | kernel-crypto-3c1f67d60e2b4f4455563928999fd41cc653645d.tar.gz kernel-crypto-3c1f67d60e2b4f4455563928999fd41cc653645d.tar.xz kernel-crypto-3c1f67d60e2b4f4455563928999fd41cc653645d.zip | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'mm')
| -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 ae6f4c174a1..79adbd7e21a 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; |