[PATCH 09/16] x86, mce: unify smp_thermal_interrupt, prepare mce_intel_64

Hidetoshi Seto
2009-06-15T08:24:25Z

Divide it into two functions.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
---
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();
}
--
1.6.3