diff options
| author | Andrew Morton | 2006-07-30 12:03:16 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-07-31 22:28:37 +0200 |
| commit | a5ca63cb60892c1703998daf80d2d1b04cb70103 (patch) | |
| tree | 9a265ce1ac462515aaa67c0f0c0424a37addc422 | |
| parent | [PATCH] Fix ppc32 zImage inflate (diff) | |
| download | kernel-qcow2-linux-a5ca63cb60892c1703998daf80d2d1b04cb70103.tar.gz kernel-qcow2-linux-a5ca63cb60892c1703998daf80d2d1b04cb70103.tar.xz kernel-qcow2-linux-a5ca63cb60892c1703998daf80d2d1b04cb70103.zip | |
[PATCH] mce section fix
mce_disabled cannot be __initdata - we access it during APM resume.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/cpu/mcheck/mce.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/mce.h b/arch/i386/kernel/cpu/mcheck/mce.h index dc2416dfef15..84fd4cf7d0fb 100644 --- a/arch/i386/kernel/cpu/mcheck/mce.h +++ b/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; |