Commit e8c8fab4 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Allow X86_MCE_NONFATAL to be a module

From: Herbert Xu <herbert@gondor.apana.org.au>

By allowing X86_MCE_NONFATAL to be a module, it can be included in
distribution kernels without upsetting those with strange hardware.
parent 973adfc0
...@@ -552,7 +552,7 @@ config X86_MCE ...@@ -552,7 +552,7 @@ config X86_MCE
the 386 and 486, so nearly everyone can say Y here. the 386 and 486, so nearly everyone can say Y here.
config X86_MCE_NONFATAL config X86_MCE_NONFATAL
bool "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4" tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
depends on X86_MCE depends on X86_MCE
help help
Enabling this feature starts a timer that triggers every 5 seconds which Enabling this feature starts a timer that triggers every 5 seconds which
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/thread_info.h> #include <linux/thread_info.h>
...@@ -18,6 +19,8 @@ ...@@ -18,6 +19,8 @@
int mce_disabled __initdata = 0; int mce_disabled __initdata = 0;
int nr_mce_banks; int nr_mce_banks;
EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */
/* Handle unconfigured int18 (should never happen) */ /* Handle unconfigured int18 (should never happen) */
static asmlinkage void unexpected_machine_check(struct pt_regs * regs, long error_code) static asmlinkage void unexpected_machine_check(struct pt_regs * regs, long error_code)
{ {
......
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