From 30e73938a7d4bf6f3b679ee15e9d7cd7ca80fbe9 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 12 Dec 2012 13:51:30 -0800
Subject: [PATCH] --- yaml --- r: 343319 b: refs/heads/master c:
 389162c22dc373932089ce16cbab43e80a88b035 h: refs/heads/master i:   343317:
 c38070fd353703c121b1a00a7256d78eb9c8cdeb   343315:
 0617d7910cb657dad2f772c7da0c14fae3c401f5   343311:
 cde28a7d26a2a92d8febcee0cbd4c4129db94763 v: v3

---
 [refs]             | 2 +-
 trunk/mm/migrate.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff4c1af2aa10..d6c87c352af0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd3a66c1cdf31274489cc1b5ace879695a5a1797
+refs/heads/master: 389162c22dc373932089ce16cbab43e80a88b035
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 3f675ca08279..cae02711181d 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -1238,7 +1238,7 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes,
 			if (node < 0 || node >= MAX_NUMNODES)
 				goto out_pm;
 
-			if (!node_state(node, N_HIGH_MEMORY))
+			if (!node_state(node, N_MEMORY))
 				goto out_pm;
 
 			err = -EACCES;