diff options
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2009-06-15 17:24:09 +0900 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-16 16:56:08 -0700 |
| commit | 5335612a574a45beab14193ec641ed2f45e7a523 (patch) | |
| tree | 44fd7a49f46c0f85b2a7a956b589b7e0c7202ae1 /arch | |
| parent | 3adacb70d32046ccc9f0333b50bb2ba1582ccdf4 (diff) | |
| download | op-kernel-dev-5335612a574a45beab14193ec641ed2f45e7a523.zip op-kernel-dev-5335612a574a45beab14193ec641ed2f45e7a523.tar.gz | |
x86, mce: unify smp_thermal_interrupt, prepare mce_intel_64
Break smp_thermal_interrupt() into two functions.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c index c548111..a5232b2 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c @@ -16,19 +16,21 @@ #include <asm/idle.h> #include <asm/therm_throt.h> -asmlinkage void smp_thermal_interrupt(void) +static void intel_thermal_interrupt(void) { __u64 msr_val; - ack_APIC_irq(); - - exit_idle(); - irq_enter(); - rdmsrl(MSR_IA32_THERM_STATUS, msr_val); if (therm_throt_process(msr_val & THERM_STATUS_PROCHOT)) mce_log_therm_throt_event(msr_val); +} +asmlinkage void smp_thermal_interrupt(void) +{ + ack_APIC_irq(); + exit_idle(); + irq_enter(); + intel_thermal_interrupt(); inc_irq_stat(irq_thermal_count); irq_exit(); } |
