mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 04:34:11 +08:00
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>
This commit is contained in:
parent
c697836985
commit
3adacb70d3
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user