---

yaml --- r: 19367 b: refs/heads/master c: 52a8363 h: refs/heads/master i: 19365: 255497d 19363: 2cfc599 19359: c627961 v: v3
git-mirror · Feb 1, 2006 · e7cab23 · e7cab23
1 parent 6903440
commit e7cab23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);