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;