Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365351
b: refs/heads/master
c: 2d42a40
h: refs/heads/master
i:
  365349: 2cab75e
  365347: 58c7fff
  365343: 4dad2e0
v: v3
  • Loading branch information
Hillf Danton authored and Linus Torvalds committed Apr 29, 2013
1 parent 0ac59af commit 492d9fb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b1058b981272f5027f9be17241441198dbd1fefd
refs/heads/master: 2d42a40d592fadbd01cb639ac21a761fa31423f8
4 changes: 0 additions & 4 deletions trunk/mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 492d9fb

Please sign in to comment.