Commit 2d0f76a6 authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky

s390/numa: move numa_init_late() from device to arch_initcall

Commit 3e89e1c5 ("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: 3e89e1c5 ("hugetlb: make mm and fs code explicitly non-modular")
Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9cb1ccec
...@@ -160,7 +160,7 @@ static int __init numa_init_late(void) ...@@ -160,7 +160,7 @@ static int __init numa_init_late(void)
register_one_node(nid); register_one_node(nid);
return 0; return 0;
} }
device_initcall(numa_init_late); arch_initcall(numa_init_late);
static int __init parse_debug(char *parm) static int __init parse_debug(char *parm)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment