]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mm: refactor zone_movable_is_highmem()
authorZhang Zhen <zhenzhang.zhang@huawei.com>
Wed, 15 Apr 2015 23:12:57 +0000 (16:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Apr 2015 23:35:16 +0000 (16:35 -0700)
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>
include/linux/mmzone.h

index 2782df47101e0cd3ee6ff199ad97f75d640b9308..54d74f6eb233521d6cb84b2720a15c3cb2e6b734 100644 (file)
@@ -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)
 {