From 95751430ff9d90560703229b6be241f7f9a53dc2 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 14 Apr 2003 06:11:02 -0700 Subject: [PATCH] [PATCH] fix MCE startup ordering problems The MCE code is setting up a timer whose handler uses the workqueue code before workqueue is initialised. If you boot slowly it oopses. Convert the MCE code to use an initcall. --- arch/i386/kernel/cpu/mcheck/k7.c | 4 ---- arch/i386/kernel/cpu/mcheck/mce.h | 2 -- arch/i386/kernel/cpu/mcheck/non-fatal.c | 5 ++++- arch/i386/kernel/cpu/mcheck/p4.c | 3 --- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/i386/kernel/cpu/mcheck/k7.c b/arch/i386/kernel/cpu/mcheck/k7.c index 1df54f5a70877..37ae4a9d3d1c0 100644 --- a/arch/i386/kernel/cpu/mcheck/k7.c +++ b/arch/i386/kernel/cpu/mcheck/k7.c @@ -92,8 +92,4 @@ void __init amd_mcheck_init(struct cpuinfo_x86 *c) set_in_cr4 (X86_CR4_MCE); printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", smp_processor_id()); - -#ifdef CONFIG_X86_MCE_NONFATAL - init_nonfatal_mce_checker(); -#endif } diff --git a/arch/i386/kernel/cpu/mcheck/mce.h b/arch/i386/kernel/cpu/mcheck/mce.h index 614719e3fe0ae..550c38a350687 100644 --- a/arch/i386/kernel/cpu/mcheck/mce.h +++ b/arch/i386/kernel/cpu/mcheck/mce.h @@ -6,8 +6,6 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c); void intel_p6_mcheck_init(struct cpuinfo_x86 *c); void winchip_mcheck_init(struct cpuinfo_x86 *c); -void init_nonfatal_mce_checker(void); - /* Call the installed machine check handler for this CPU setup. */ extern void (*machine_check_vector)(struct pt_regs *, long error_code); diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c index 9bbb02ba6abca..f657dc87ccbce 100644 --- a/arch/i386/kernel/cpu/mcheck/non-fatal.c +++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -65,7 +66,7 @@ static void mce_timerfunc (unsigned long data) add_timer (&mce_timer); } -void init_nonfatal_mce_checker() +static int __init init_nonfatal_mce_checker(void) { if (timerset == 0) { /* Set the timer to check for non-fatal @@ -78,4 +79,6 @@ void init_nonfatal_mce_checker() timerset = 1; printk(KERN_INFO "Machine check exception polling timer started.\n"); } + return 0; } +module_init(init_nonfatal_mce_checker); diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/i386/kernel/cpu/mcheck/p4.c index 044aab612f666..3533664fc4a74 100644 --- a/arch/i386/kernel/cpu/mcheck/p4.c +++ b/arch/i386/kernel/cpu/mcheck/p4.c @@ -255,7 +255,4 @@ void __init intel_p4_mcheck_init(struct cpuinfo_x86 *c) intel_init_thermal(c); #endif } -#ifdef CONFIG_X86_MCE_NONFATAL - init_nonfatal_mce_checker(); -#endif } -- 2.53.0