---

yaml --- r: 320799 b: refs/heads/master c: fe03025 h: refs/heads/master i: 320797: 2d9d2f6 320795: 545017f 320791: 7013e33 320783: d8e34a3 320767: 3d65167 v: v3
git-mirror · Aug 1, 2012 · e29517c · e29517c
1 parent 56cd3ce
commit e29517c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;