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

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index def8e0dda269ccf84d32eceb6956a80753f08989..3e08a30baca64869265460242a3304f6eb9b7f2d 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -552,7 +552,7 @@ config X86_MCE
          the 386 and 486, so nearly everyone can say Y here.
 
 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
        help
          Enabling this feature starts a timer that triggers every 5 seconds which

diff --git a/arch/i386/kernel/cpu/mcheck/mce.c b/arch/i386/kernel/cpu/mcheck/mce.c
index f8729415e4f2e8316fc8c0137187ed496f9790f3..207f10d5876157dedd6d176173ef474f17c3e33a 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/mce.c
+++ b/arch/i386/kernel/cpu/mcheck/mce.c
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/thread_info.h>
 
@@ -18,6 +19,8 @@
 int mce_disabled __initdata = 0;
 int nr_mce_banks;
 
+EXPORT_SYMBOL_GPL(nr_mce_banks);       /* non-fatal.o */
+
 /* Handle unconfigured int18 (should never happen) */
 static asmlinkage void unexpected_machine_check(struct pt_regs * regs, long error_code)
 {