diff options
| author | Andi Kleen <andi@firstfloor.org> | 2009-07-09 00:31:42 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-09 18:39:47 -0700 |
| commit | 9eda8cb3ac235217e4ffa01cb9cedee1c1550599 (patch) | |
| tree | c4f884f86a1d61ff64c5600fb84eaa7bf08a2ae0 | |
| parent | c1ebf835617035b1f08f734247dcb981e17aac6b (diff) | |
| download | linux-9eda8cb3ac235217e4ffa01cb9cedee1c1550599.tar.gz linux-9eda8cb3ac235217e4ffa01cb9cedee1c1550599.tar.bz2 linux-9eda8cb3ac235217e4ffa01cb9cedee1c1550599.zip | |
x86: mce: Move code in mce.c
Now that the X86_OLD_MCE ifdefs are gone move some code that
used to be outside the big ifdef to a more natural place
near its user.
No code change.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 5ff6362ecb18..e16271f01ac4 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -45,17 +45,6 @@ #include "mce-internal.h" -/* Handle unconfigured int18 (should never happen) */ -static void unexpected_machine_check(struct pt_regs *regs, long error_code) -{ - printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", - smp_processor_id()); -} - -/* Call the installed machine check handler for this CPU setup. */ -void (*machine_check_vector)(struct pt_regs *, long error_code) = - unexpected_machine_check; - int mce_disabled __read_mostly; #define MISC_MCELOG_MINOR 227 @@ -1322,6 +1311,17 @@ static void mce_init_timer(void) add_timer(t); } +/* Handle unconfigured int18 (should never happen) */ +static void unexpected_machine_check(struct pt_regs *regs, long error_code) +{ + printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", + smp_processor_id()); +} + +/* Call the installed machine check handler for this CPU setup. */ +void (*machine_check_vector)(struct pt_regs *, long error_code) = + unexpected_machine_check; + /* * Called for each booted CPU to set up machine checks. * Must be called with preempt off: |