From 15952aa9601a52444129c4537c9087c7c9a3fdfc Mon Sep 17 00:00:00 2001 From: Vincent Li Date: Mon, 21 Sep 2009 17:03:09 -0700 Subject: [PATCH] --- yaml --- r: 164455 b: refs/heads/master c: 0b21767637c3c99890a248fe47ac414e51cf5eb7 h: refs/heads/master i: 164453: 5dca002d00641d768653bddc25d53c83f0f34472 164451: 98320091537d76532fa199ce7e64b803fd72dfc6 164447: 2f36e9abf4f1db576b90664e0cfca40d55752292 v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5f425e550478..9284399b7d61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c85f51d222ccdd8c401d77a36b723a89156810d +refs/heads/master: 0b21767637c3c99890a248fe47ac414e51cf5eb7 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 5be8107e7758..5432c230c4cb 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -148,8 +148,8 @@ static struct zone_reclaim_stat *get_reclaim_stat(struct zone *zone, return &zone->reclaim_stat; } -static unsigned long zone_nr_pages(struct zone *zone, struct scan_control *sc, - enum lru_list lru) +static unsigned long zone_nr_lru_pages(struct zone *zone, + struct scan_control *sc, enum lru_list lru) { if (!scanning_global_lru(sc)) return mem_cgroup_zone_nr_pages(sc->mem_cgroup, zone, lru); @@ -1489,10 +1489,10 @@ static void get_scan_ratio(struct zone *zone, struct scan_control *sc, unsigned long ap, fp; struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); - anon = zone_nr_pages(zone, sc, LRU_ACTIVE_ANON) + - zone_nr_pages(zone, sc, LRU_INACTIVE_ANON); - file = zone_nr_pages(zone, sc, LRU_ACTIVE_FILE) + - zone_nr_pages(zone, sc, LRU_INACTIVE_FILE); + anon = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_ANON) + + zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON); + file = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_FILE) + + zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE); if (scanning_global_lru(sc)) { free = zone_page_state(zone, NR_FREE_PAGES); @@ -1600,7 +1600,7 @@ static void shrink_zone(int priority, struct zone *zone, int file = is_file_lru(l); unsigned long scan; - scan = zone_nr_pages(zone, sc, l); + scan = zone_nr_lru_pages(zone, sc, l); if (priority || noswap) { scan >>= priority; scan = (scan * percent[file]) / 100;