2002-10-04 14:37:31

by Martin Schwidefsky

[permalink] [raw]
Subject: [PATCH] 2.5.40 s390 (25/27): init call.

Remove call to s390_init_machine_check in init/main.c, the new boot code
on s390 calls it via arch_initcall.

diff -urN linux-2.5.40/init/main.c linux-2.5.40-s390/init/main.c
--- linux-2.5.40/init/main.c Tue Oct 1 09:06:20 2002
+++ linux-2.5.40-s390/init/main.c Fri Oct 4 16:16:50 2002
@@ -493,13 +493,6 @@
sysctl_init();
#endif

- /*
- * Ok, at this point all CPU's should be initialized, so
- * we can start looking into devices..
- */
-#if defined(CONFIG_ARCH_S390)
- s390_init_machine_check();
-#endif
/* Networking initialization needs a process context */
sock_init();