renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

x86, mce: unify smp_thermal_interrupt, prepare p4

Browse Source 
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>
This commit is contained in:
Hidetoshi Seto 2009-06-15 17:23:28 +09:00 committed by H. Peter Anvin
parent c697836985
commit 3adacb70d3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/cpu/mcheck/p4.c
View File

@ -35,7 +35,7 @@ static int mce_num_extended_msrs;
#ifdef CONFIG_X86_MCE_P4THERMAL #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", printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n",
smp_processor_id()); smp_processor_id());
@ -43,7 +43,7 @@ static void unexpected_thermal_interrupt(struct pt_regs *regs)
} }
/* P4/Xeon Thermal transition interrupt handler: */ /* P4/Xeon Thermal transition interrupt handler: */
static void intel_thermal_interrupt(struct pt_regs *regs) static void intel_thermal_interrupt(void)
{ {
__u64 msr_val; __u64 msr_val;
@ -54,14 +54,13 @@ static void intel_thermal_interrupt(struct pt_regs *regs)
} }
/* Thermal interrupt handler for this CPU setup: */ /* Thermal interrupt handler for this CPU setup: */
static void (*vendor_thermal_interrupt)(struct pt_regs *regs) = static void (*vendor_thermal_interrupt)(void) = unexpected_thermal_interrupt;
unexpected_thermal_interrupt;
void smp_thermal_interrupt(struct pt_regs *regs) void smp_thermal_interrupt(struct pt_regs *regs)
{ {
irq_enter(); irq_enter();
vendor_thermal_interrupt(regs); vendor_thermal_interrupt();
__get_cpu_var(irq_stat).irq_thermal_count++; inc_irq_stat(irq_thermal_count);
irq_exit(); irq_exit();
} }