From e7cab23a928bc2eaf52e773ddbaef8400f56660e Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 1 Feb 2006 03:05:28 -0800 Subject: [PATCH] --- yaml --- r: 19367 b: refs/heads/master c: 52a8363eae3872af15880292ff4e06d0fab36986 h: refs/heads/master i: 19365: 255497dd01ac11f849988e7901a0d83d4e4a9d58 19363: 2cfc5998fe368129083c9e12202b7a7034a53e0f 19359: c627961e3241fe84d5af86fa6b3278f15d0eb26b v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c9e258386e60..304440b1f93f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce2ea89ba101d976907128441ba3aca72a8804b9 +refs/heads/master: 52a8363eae3872af15880292ff4e06d0fab36986 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 0ca6007d655b..a29efb2c06c8 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -492,7 +492,7 @@ static int shrink_list(struct list_head *page_list, struct scan_control *sc) goto keep_locked; if (!may_enter_fs) goto keep_locked; - if (laptop_mode && !sc->may_writepage) + if (!sc->may_writepage) goto keep_locked; /* Page is dirty, try to write it out here */ @@ -1170,7 +1170,7 @@ int try_to_free_pages(struct zone **zones, gfp_t gfp_mask) int i; sc.gfp_mask = gfp_mask; - sc.may_writepage = 0; + sc.may_writepage = !laptop_mode; sc.may_swap = 1; inc_page_state(allocstall); @@ -1273,7 +1273,7 @@ static int balance_pgdat(pg_data_t *pgdat, int nr_pages, int order) total_scanned = 0; total_reclaimed = 0; sc.gfp_mask = GFP_KERNEL; - sc.may_writepage = 0; + sc.may_writepage = !laptop_mode; sc.may_swap = 1; sc.nr_mapped = read_page_state(nr_mapped);