summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorZhang Zhen <zhenzhang.zhang@huawei.com>2015-04-15 16:12:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-15 16:35:16 -0700
commitd7e4a2ea51c1b0ac0b2d53f5ab4a2e878b1c4aec (patch)
treed3a3c0f1f5fa70f1134ecd01c1e22621fe50f5ae /include
parentbdddbcd45fd191a0213e6d2a032eb55d18bd1fc0 (diff)
downloadlinux-d7e4a2ea51c1b0ac0b2d53f5ab4a2e878b1c4aec.tar.bz2
mm: refactor zone_movable_is_highmem()
All callers of zone_movable_is_highmem are under #ifdef CONFIG_HIGHMEM, so the else branch return 0 is not needed. Signed-off-by: Zhang Zhen <zhenzhang.zhang@huawei.com> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmzone.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 2782df47101e..54d74f6eb233 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -842,16 +842,16 @@ static inline int populated_zone(struct zone *zone)
extern int movable_zone;
+#ifdef CONFIG_HIGHMEM
static inline int zone_movable_is_highmem(void)
{
-#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP)
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
return movable_zone == ZONE_HIGHMEM;
-#elif defined(CONFIG_HIGHMEM)
- return (ZONE_MOVABLE - 1) == ZONE_HIGHMEM;
#else
- return 0;
+ return (ZONE_MOVABLE - 1) == ZONE_HIGHMEM;
#endif
}
+#endif
static inline int is_highmem_idx(enum zone_type idx)
{