2 files changed, 11 insertions, 1 deletions

diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c
index fbc394e16b2c..37e0bb835516 100644
--- a/arch/s390/numa/mode_emu.c
+++ b/arch/s390/numa/mode_emu.c
@@ -482,8 +482,12 @@ static int emu_setup_nodes_adjust(int nodes)
  */
 static void emu_setup(void)
 {
+        int nid;
+
         emu_size = emu_setup_size_adjust(emu_size);
         emu_nodes = emu_setup_nodes_adjust(emu_nodes);
+        for (nid = 0; nid < emu_nodes; nid++)
+                node_set(nid, node_possible_map);
         pr_info("Creating %d nodes with memory stripe size %ld MB\n",
                 emu_nodes, emu_size >> 20);
 }
diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
index 2794845061c6..f576f1073378 100644
--- a/arch/s390/numa/numa.c
+++ b/arch/s390/numa/numa.c
@@ -26,8 +26,14 @@ EXPORT_SYMBOL(node_data);
 cpumask_t node_to_cpumask_map[MAX_NUMNODES];
 EXPORT_SYMBOL(node_to_cpumask_map);
 
+static void plain_setup(void)
+{
+        node_set(0, node_possible_map);
+}
+
 const struct numa_mode numa_mode_plain = {
         .name = "plain",
+        .setup = plain_setup,
 };
 
 static const struct numa_mode *mode = &numa_mode_plain;
@@ -126,13 +132,13 @@ static void __init numa_setup_memory(void)
 void __init numa_setup(void)
 {
         pr_info("NUMA mode: %s\n", mode->name);
+        nodes_clear(node_possible_map);
         if (mode->setup)
                 mode->setup();
         numa_setup_memory();
         memblock_dump_all();
 }
 
-
 /*
  * numa_init_early() - Initialization initcall
  *