4 files changed, 21 insertions, 0 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 49dbe7dc9ada..fac124a7e1c5 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -644,6 +644,9 @@ 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),
 };
 
@@ -654,6 +657,9 @@ 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
 };
diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index c6ebdc97a428..4e2cbfa640b7 100644
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -380,7 +380,11 @@ enum node_states {
 #else
         N_HIGH_MEMORY = N_NORMAL_MEMORY,
 #endif
+#ifdef CONFIG_MOVABLE_NODE
+        N_MEMORY,               /* The node has memory(regular, high, movable) */
+#else
         N_MEMORY = N_HIGH_MEMORY,
+#endif
         N_CPU,          /* The node has one or more cpus */
         NR_NODE_STATES
 };
diff --git a/mm/Kconfig b/mm/Kconfig
index e6651c5de14f..1680a0123a13 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -143,6 +143,14 @@ config NO_BOOTMEM
 config MEMORY_ISOLATION
         boolean
 
+config MOVABLE_NODE
+        boolean "Enable to assign a node which has only movable memory"
+        depends on HAVE_MEMBLOCK
+        depends on NO_BOOTMEM
+        depends on X86_64
+        depends on NUMA
+        default y
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
         bool "Allow for memory hot-add"
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 35727168896b..2bf0d43d646b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -90,6 +90,9 @@ nodemask_t node_states[NR_NODE_STATES] __read_mostly = {
 #ifdef CONFIG_HIGHMEM
         [N_HIGH_MEMORY] = { { [0] = 1UL } },
 #endif
+#ifdef CONFIG_MOVABLE_NODE
+        [N_MEMORY] = { { [0] = 1UL } },
+#endif
         [N_CPU] = { { [0] = 1UL } },
 #endif  /* NUMA */
 };