From: Andrew Morton <akpm@linux-foundation.org>

Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/mmzone.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN include/linux/mmzone.h~create-the-zone_movable-zone-fix-2 include/linux/mmzone.h
--- a/include/linux/mmzone.h~create-the-zone_movable-zone-fix-2
+++ a/include/linux/mmzone.h
@@ -531,9 +531,10 @@ static inline int populated_zone(struct 
 }
 
 extern int movable_zone;
+
 static inline int zone_movable_is_highmem(void)
 {
-#ifdef CONFIG_HIGHMEM
+#if defined(CONFIG_HIGHMEM) && defined(CONFIG_ARCH_POPULATES_NODE_MAP)
 	return movable_zone == ZONE_HIGHMEM;
 #else
 	return 0;
_