From e29517c9ed4270437fea4f5b45a454b224d193df Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Tue, 31 Jul 2012 16:43:14 -0700
Subject: [PATCH] --- yaml --- r: 320799 b: refs/heads/master c:
 fe03025db3f4ade1f231b174938e0fe224722759 h: refs/heads/master i:   320797:
 2d9d2f6bc208498e661dbf57c44dc7616c1ca169   320795:
 545017f867490db46e04daafff0fb308137b071d   320791:
 7013e33f80714bf9cc34f20392a1ea0db2b0f101   320783:
 d8e34a349db31ab6c18b1aa6541196b92765ff47   320767:
 3d65167e220f08a59dc1cde9e617fe226e164c3b v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/mmzone.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bbbcfd7bc73d..f1fac374a38f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db8889ab05b57200158432755af318fb68854a2
+refs/heads/master: fe03025db3f4ade1f231b174938e0fe224722759
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index 1aeadce4d56e..f64afa5929fe 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -776,7 +776,7 @@ extern int movable_zone;
 
 static inline int zone_movable_is_highmem(void)
 {
-#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE)
+#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP)
 	return movable_zone == ZONE_HIGHMEM;
 #else
 	return 0;