From dc9d2a41a57a025a2ed2b65fee925bc9699b417b Mon Sep 17 00:00:00 2001 From: Rik van Riel Date: Thu, 13 Jan 2011 15:47:13 -0800 Subject: [PATCH] --- yaml --- r: 230805 b: refs/heads/master c: 9992af102974f3f8a02a1f2729c3461881539e26 h: refs/heads/master i: 230803: 4ee30f8efc5a081d67ceede3884d14bace3fc28a v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea49f621ea1d..8707682bd5c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c888cfbc1b45508a44763d85ba2e8ac43faff5f +refs/heads/master: 9992af102974f3f8a02a1f2729c3461881539e26 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 0882014d2ce5..47a50962ce81 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1276,7 +1276,8 @@ putback_lru_pages(struct zone *zone, struct scan_control *sc, add_page_to_lru_list(zone, page, lru); if (is_active_lru(lru)) { int file = is_file_lru(lru); - reclaim_stat->recent_rotated[file]++; + int numpages = hpage_nr_pages(page); + reclaim_stat->recent_rotated[file] += numpages; } if (!pagevec_add(&pvec, page)) { spin_unlock_irq(&zone->lru_lock); @@ -1552,7 +1553,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, } if (page_referenced(page, 0, sc->mem_cgroup, &vm_flags)) { - nr_rotated++; + nr_rotated += hpage_nr_pages(page); /* * Identify referenced, file-backed active pages and * give them one more trip around the active list. So