s390/numa: move code to arch/s390/kernel

Move all code from arch/s390/numa/ to arch/s390/kernel/
since numa.c is the only source file and all others were
deleted with the fake NUMA support removal.

Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild
index e63940b..8b98c50 100644 (file)
--- a/arch/s390/Kbuild
+++ b/arch/s390/Kbuild
@@ -7,5 +7,4 @@ obj-$(CONFIG_S390_HYPFS_FS)     += hypfs/
 obj-$(CONFIG_APPLDATA_BASE)    += appldata/
 obj-y                          += net/
 obj-$(CONFIG_PCI)              += pci/
-obj-$(CONFIG_NUMA)             += numa/
 obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index a8f1369..efca709 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -49,6 +49,7 @@ CFLAGS_REMOVE_nospec-branch.o += $(CC_FLAGS_EXPOLINE)
 
 obj-$(CONFIG_MODULES)          += module.o
 obj-$(CONFIG_SCHED_TOPOLOGY)   += topology.o
+obj-$(CONFIG_NUMA)             += numa.o
 obj-$(CONFIG_AUDIT)            += audit.o
 compat-obj-$(CONFIG_AUDIT)     += compat_audit.o
 obj-$(CONFIG_COMPAT)           += compat_linux.o compat_signal.o

diff --git a/arch/s390/kernel/numa.c b/arch/s390/kernel/numa.c
new file mode 100644 (file)
index 0000000..51c5a9f
--- /dev/null
+++ b/arch/s390/kernel/numa.c
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * NUMA support for s390
+ *
+ * Implement NUMA core code.
+ *
+ * Copyright IBM Corp. 2015
+ */
+
+#include <linux/kernel.h>
+#include <linux/mmzone.h>
+#include <linux/cpumask.h>
+#include <linux/memblock.h>
+#include <linux/node.h>
+#include <asm/numa.h>
+
+struct pglist_data *node_data[MAX_NUMNODES];
+EXPORT_SYMBOL(node_data);
+
+void __init numa_setup(void)
+{
+       int nid;
+
+       nodes_clear(node_possible_map);
+       node_set(0, node_possible_map);
+       node_set_online(0);
+       for (nid = 0; nid < MAX_NUMNODES; nid++) {
+               NODE_DATA(nid) = memblock_alloc(sizeof(pg_data_t), 8);
+               if (!NODE_DATA(nid))
+                       panic("%s: Failed to allocate %zu bytes align=0x%x\n",
+                             __func__, sizeof(pg_data_t), 8);
+       }
+       NODE_DATA(0)->node_spanned_pages = memblock_end_of_DRAM() >> PAGE_SHIFT;
+       NODE_DATA(0)->node_id = 0;
+}
+
+static int __init numa_init_late(void)
+{
+       register_one_node(0);
+       return 0;
+}
+arch_initcall(numa_init_late);

diff --git a/arch/s390/numa/Makefile b/arch/s390/numa/Makefile
deleted file mode 100644 (file)
index c89d26f..0000000
--- a/arch/s390/numa/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-y                  += numa.o

diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
deleted file mode 100644 (file)
index 51c5a9f..0000000
--- a/arch/s390/numa/numa.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * NUMA support for s390
- *
- * Implement NUMA core code.
- *
- * Copyright IBM Corp. 2015
- */
-
-#include <linux/kernel.h>
-#include <linux/mmzone.h>
-#include <linux/cpumask.h>
-#include <linux/memblock.h>
-#include <linux/node.h>
-#include <asm/numa.h>
-
-struct pglist_data *node_data[MAX_NUMNODES];
-EXPORT_SYMBOL(node_data);
-
-void __init numa_setup(void)
-{
-       int nid;
-
-       nodes_clear(node_possible_map);
-       node_set(0, node_possible_map);
-       node_set_online(0);
-       for (nid = 0; nid < MAX_NUMNODES; nid++) {
-               NODE_DATA(nid) = memblock_alloc(sizeof(pg_data_t), 8);
-               if (!NODE_DATA(nid))
-                       panic("%s: Failed to allocate %zu bytes align=0x%x\n",
-                             __func__, sizeof(pg_data_t), 8);
-       }
-       NODE_DATA(0)->node_spanned_pages = memblock_end_of_DRAM() >> PAGE_SHIFT;
-       NODE_DATA(0)->node_id = 0;
-}
-
-static int __init numa_init_late(void)
-{
-       register_one_node(0);
-       return 0;
-}
-arch_initcall(numa_init_late);