mm, memory_hotplug: drop CONFIG_MOVABLE_NODE

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 6b1ee371ee9723cd234a0e284e4c5aea0dc8eb38..73d39bc58c42d647e565655b052c6ae6356ce759 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -639,9 +639,7 @@ static struct node_attr node_state_attr[] = {
 #ifdef CONFIG_HIGHMEM
        [N_HIGH_MEMORY] = _NODE_ATTR(has_high_memory, N_HIGH_MEMORY),
 #endif
-#ifdef CONFIG_MOVABLE_NODE
        [N_MEMORY] = _NODE_ATTR(has_memory, N_MEMORY),
-#endif
        [N_CPU] = _NODE_ATTR(has_cpu, N_CPU),
 };
 
@@ -652,9 +650,7 @@ static struct attribute *node_state_attrs[] = {
 #ifdef CONFIG_HIGHMEM
        &node_state_attr[N_HIGH_MEMORY].attr.attr,
 #endif
-#ifdef CONFIG_MOVABLE_NODE
        &node_state_attr[N_MEMORY].attr.attr,
-#endif
        &node_state_attr[N_CPU].attr.attr,
        NULL
 };