From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Date: Wed, 20 Jan 2016 18:22:16 +0000 (+0100)
Subject: s390/numa: move numa_init_late() from device to arch_initcall
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2d0f76a6ca1f2cdcffca7ce130f67ec61caa0999;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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)
 {