From a2a5d2c671d2ecb2b9f60bf8b4117fa95a1c7bec Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 12 Dec 2012 13:51:21 -0800
Subject: [PATCH] --- yaml --- r: 343314 b: refs/heads/master c:
 8219fc48adb3b09eabf502c560bf13f273ea69a3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/nodemask.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d719f6aea9b..03bbd8b7ea3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be49a6e13537f32f85bd8c4ba04317ca36ca60ff
+refs/heads/master: 8219fc48adb3b09eabf502c560bf13f273ea69a3
diff --git a/trunk/include/linux/nodemask.h b/trunk/include/linux/nodemask.h
index 7afc36334d52..c6ebdc97a428 100644
--- a/trunk/include/linux/nodemask.h
+++ b/trunk/include/linux/nodemask.h
@@ -380,6 +380,7 @@ enum node_states {
 #else
 	N_HIGH_MEMORY = N_NORMAL_MEMORY,
 #endif
+	N_MEMORY = N_HIGH_MEMORY,
 	N_CPU,		/* The node has one or more cpus */
 	NR_NODE_STATES
 };