diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-19 09:21:08 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-19 09:21:08 -0400 |
commit | 2b3d6e2f23362b71de173649002d915d14e07622 (patch) | |
tree | 6c1aab54bb16b4f0d06cd3b838e3e41d8488fb98 /mm/vmscan.c | |
parent | 7d5513d58d072cf38cae9c886653aadac38ef4a9 (diff) | |
parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) |
Merge branch 'master'
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 4649a63a8cb..440a733fe2e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1061,7 +1061,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, unsigned long nr_pages, | |||
1061 | loop_again: | 1061 | loop_again: |
1062 | total_scanned = 0; | 1062 | total_scanned = 0; |
1063 | nr_reclaimed = 0; | 1063 | nr_reclaimed = 0; |
1064 | sc.may_writepage = !laptop_mode, | 1064 | sc.may_writepage = !laptop_mode; |
1065 | sc.nr_mapped = read_page_state(nr_mapped); | 1065 | sc.nr_mapped = read_page_state(nr_mapped); |
1066 | 1066 | ||
1067 | inc_page_state(pageoutrun); | 1067 | inc_page_state(pageoutrun); |