From a210cde60c9c749c2d113062e6d5ec75efd5f2a5 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Tue, 29 May 2012 15:07:00 -0700 Subject: [PATCH] --- yaml --- r: 308911 b: refs/heads/master c: 27ac81d85e5cfcc755dd5fa3f04dc883ab5d821b h: refs/heads/master i: 308909: 9b61adacafe5b8767b07064c7eff5e48fbe1570d 308907: bdd92310435a45acd2ea1b4b343408005f909a75 308903: 6d630d1f8e6fbd98531ca5412d671ecca81c422f 308895: 6050aa005cecbf038ae3e7e4e31b30e8b6f96758 v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a99d5087f4a..c64521879f7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95d918fc009072c2f88ce2e8b5db2e5abfad7c3e +refs/heads/master: 27ac81d85e5cfcc755dd5fa3f04dc883ab5d821b diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 53fa8671eabd..76d786eb84a8 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1155,11 +1155,11 @@ static int too_many_isolated(struct zone *zone, int file, } static noinline_for_stack void -putback_inactive_pages(struct mem_cgroup_zone *mz, +putback_inactive_pages(struct lruvec *lruvec, struct list_head *page_list) { - struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz); - struct zone *zone = mz->zone; + struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; + struct zone *zone = lruvec_zone(lruvec); LIST_HEAD(pages_to_free); /* @@ -1278,7 +1278,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, nr_reclaimed); } - putback_inactive_pages(mz, &page_list); + putback_inactive_pages(lruvec, &page_list); __mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken);