From a532cbd844a51917bb1736b15f224fca09a1f132 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Tue, 10 Aug 2010 18:03:05 -0700
Subject: [PATCH] --- yaml --- r: 208527 b: refs/heads/master c:
 14fec79680f7cc4617d6ba69324e63d4a732986c h: refs/heads/master i:   208525:
 1f2366e2403692bc062f59f9abb98d8948b7496f   208523:
 28606c850a59112e86143ba71837a29f8cdeb0ed   208519:
 572abb6b80763b7daf72d8725514fd940f630ffe   208511:
 ddb7fb554d7d59bfbe6bf76e258f417dbbb79a2a v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/swap.h | 3 +--
 trunk/mm/memcontrol.c      | 3 +--
 trunk/mm/vmscan.c          | 5 +----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index fca741061f44..49e1e0f18583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da280d636b83f0f5d92921c99ef5c7d7c3e751cc
+refs/heads/master: 14fec79680f7cc4617d6ba69324e63d4a732986c
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index 91c9d3fc8513..2fee51a11b73 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/include/linux/swap.h
@@ -244,8 +244,7 @@ extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem,
 extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
 						gfp_t gfp_mask, bool noswap,
 						unsigned int swappiness,
-						struct zone *zone,
-						int nid);
+						struct zone *zone);
 extern int __isolate_lru_page(struct page *page, int mode, int file);
 extern unsigned long shrink_all_memory(unsigned long nr_pages);
 extern int vm_swappiness;
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index a1c3c317a4dd..8d0bfd7fe328 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -1300,8 +1300,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
 		/* we use swappiness of local cgroup */
 		if (check_soft)
 			ret = mem_cgroup_shrink_node_zone(victim, gfp_mask,
-				noswap, get_swappiness(victim), zone,
-				zone->zone_pgdat->node_id);
+				noswap, get_swappiness(victim), zone);
 		else
 			ret = try_to_free_mem_cgroup_pages(victim, gfp_mask,
 						noswap, get_swappiness(victim));
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 291270496b6f..06ccda66dec0 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -1969,7 +1969,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
 unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
 						gfp_t gfp_mask, bool noswap,
 						unsigned int swappiness,
-						struct zone *zone, int nid)
+						struct zone *zone)
 {
 	struct scan_control sc = {
 		.nr_to_reclaim = SWAP_CLUSTER_MAX,
@@ -1980,11 +1980,8 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
 		.order = 0,
 		.mem_cgroup = mem,
 	};
-	nodemask_t nm  = nodemask_of_node(nid);
-
 	sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
 			(GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
-	sc.nodemask = &nm;
 
 	trace_mm_vmscan_memcg_softlimit_reclaim_begin(0,
 						      sc.may_writepage,