From 492d9fb0002bf7a729d52b335bd160a47cf7a3b3 Mon Sep 17 00:00:00 2001 From: Hillf Danton Date: Mon, 29 Apr 2013 15:06:19 -0700 Subject: [PATCH] --- yaml --- r: 365351 b: refs/heads/master c: 2d42a40d592fadbd01cb639ac21a761fa31423f8 h: refs/heads/master i: 365349: 2cab75e1f0a9a4e271619182501a66f6f6337e31 365347: 58c7fffa2ccd4b553e87eccb526131da06d4ed15 365343: 4dad2e01b0158b17d28dee82a5c184e9811f8e27 v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4fdde260c9c7..89c73fdbc360 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1058b981272f5027f9be17241441198dbd1fefd +refs/heads/master: 2d42a40d592fadbd01cb639ac21a761fa31423f8 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 669fba39be1a..e03a00b09da9 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2619,7 +2619,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order, bool pgdat_is_balanced = false; int i; int end_zone = 0; /* Inclusive. 0 = ZONE_DMA */ - unsigned long total_scanned; struct reclaim_state *reclaim_state = current->reclaim_state; unsigned long nr_soft_reclaimed; unsigned long nr_soft_scanned; @@ -2639,7 +2638,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order, .gfp_mask = sc.gfp_mask, }; loop_again: - total_scanned = 0; sc.priority = DEF_PRIORITY; sc.nr_reclaimed = 0; sc.may_writepage = !laptop_mode; @@ -2730,7 +2728,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order, order, sc.gfp_mask, &nr_soft_scanned); sc.nr_reclaimed += nr_soft_reclaimed; - total_scanned += nr_soft_scanned; /* * We put equal pressure on every zone, unless @@ -2765,7 +2762,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order, reclaim_state->reclaimed_slab = 0; nr_slab = shrink_slab(&shrink, sc.nr_scanned, lru_pages); sc.nr_reclaimed += reclaim_state->reclaimed_slab; - total_scanned += sc.nr_scanned; if (nr_slab == 0 && !zone_reclaimable(zone)) zone->all_unreclaimable = 1;