Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / arch / s390 / numa / numa.c

diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
index 2794845061c66fe3605c0b2e97b591b6cf176d32..f576f1073378f2ac6d5c0f0913e3974d3c768621 100644 (file)
--- 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
  *