diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /mm/vmscan.c | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
Merge branch 'merge'
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 4649a63a8cb6..440a733fe2e9 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); |