From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Mon, 15 Jun 2009 08:23:28 +0000 (+0900)
Subject: x86, mce: unify smp_thermal_interrupt, prepare p4
X-Git-Tag: MMI-PSA29.97-13-9~26924^2~34
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3adacb70d32046ccc9f0333b50bb2ba1582ccdf4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

x86, mce: unify smp_thermal_interrupt, prepare p4

Remove unused argument regs from handlers, and use inc_irq_stat.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
index 8d3e40edd64d..ddeed6e295af 100644
--- a/arch/x86/kernel/cpu/mcheck/p4.c
+++ b/arch/x86/kernel/cpu/mcheck/p4.c
@@ -35,7 +35,7 @@ static int mce_num_extended_msrs;
 
 #ifdef CONFIG_X86_MCE_P4THERMAL
 
-static void unexpected_thermal_interrupt(struct pt_regs *regs)
+static void unexpected_thermal_interrupt(void)
 {
 	printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n",
 			smp_processor_id());
@@ -43,7 +43,7 @@ static void unexpected_thermal_interrupt(struct pt_regs *regs)
 }
 
 /* P4/Xeon Thermal transition interrupt handler: */
-static void intel_thermal_interrupt(struct pt_regs *regs)
+static void intel_thermal_interrupt(void)
 {
 	__u64 msr_val;
 
@@ -54,14 +54,13 @@ static void intel_thermal_interrupt(struct pt_regs *regs)
 }
 
 /* Thermal interrupt handler for this CPU setup: */
-static void (*vendor_thermal_interrupt)(struct pt_regs *regs) =
-						unexpected_thermal_interrupt;
+static void (*vendor_thermal_interrupt)(void) = unexpected_thermal_interrupt;
 
 void smp_thermal_interrupt(struct pt_regs *regs)
 {
 	irq_enter();
-	vendor_thermal_interrupt(regs);
-	__get_cpu_var(irq_stat).irq_thermal_count++;
+	vendor_thermal_interrupt();
+	inc_irq_stat(irq_thermal_count);
 	irq_exit();
 }