From a72b63f82e873659dc838dcaf6d44125da26bc67 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 30 Jul 2006 03:03:16 -0700
Subject: [PATCH] --- yaml --- r: 32918 b: refs/heads/master c:
 a5ca63cb60892c1703998daf80d2d1b04cb70103 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/i386/kernel/cpu/mcheck/mce.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f95c2fecaccc..f6d739ddaae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31925c8857ba17c11129b766a980ff7c87780301
+refs/heads/master: a5ca63cb60892c1703998daf80d2d1b04cb70103
diff --git a/trunk/arch/i386/kernel/cpu/mcheck/mce.h b/trunk/arch/i386/kernel/cpu/mcheck/mce.h
index dc2416dfef15..84fd4cf7d0fb 100644
--- a/trunk/arch/i386/kernel/cpu/mcheck/mce.h
+++ b/trunk/arch/i386/kernel/cpu/mcheck/mce.h
@@ -9,6 +9,6 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c);
 /* Call the installed machine check handler for this CPU setup. */
 extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
 
-extern int mce_disabled __initdata;
+extern int mce_disabled;
 extern int nr_mce_banks;