summaryrefslogtreecommitdiff
path: root/arch/s390/numa
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2016-01-20 19:22:16 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-01-26 12:45:24 +0100
commit2d0f76a6ca1f2cdcffca7ce130f67ec61caa0999 (patch)
treeee61e1380c0af2d07969fb47e3bb468e128f4130 /arch/s390/numa
parent9cb1ccecb69d133e014b7be4de2609f689398c07 (diff)
s390/numa: move numa_init_late() from device to arch_initcall
Commit 3e89e1c5ea ("hugetlb: make mm and fs code explicitly non-modular") moves hugetlb_init() from module_init to subsys_initcall. The hugetlb_init()->hugetlb_register_node() code accesses "node->dev.kobj" which is initialized in numa_init_late(). Since numa_init_late() is a device_initcall which is called *after* subsys_initcall the above mentioned patch breaks NUMA on s390. So fix this and move numa_init_late() to arch_initcall. Fixes: 3e89e1c5ea ("hugetlb: make mm and fs code explicitly non-modular") Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/numa')
-rw-r--r--arch/s390/numa/numa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
index 969b4ed4ed5e..2794845061c6 100644
--- a/arch/s390/numa/numa.c
+++ b/arch/s390/numa/numa.c
@@ -160,7 +160,7 @@ static int __init numa_init_late(void)
register_one_node(nid);
return 0;
}
-device_initcall(numa_init_late);
+arch_initcall(numa_init_late);
static int __init parse_debug(char *parm)
{