ff3c3ca3b8
[ Upstream commit 68b5e4326e ]
Add the proper includes and make smca_get_name() static.
Fix an actual bug too which the warning triggered:
arch/x86/kernel/cpu/mcheck/therm_throt.c:395:39: error: conflicting \
types for ‘smp_thermal_interrupt’
asmlinkage __visible void __irq_entry smp_thermal_interrupt(struct pt_regs *r)
^~~~~~~~~~~~~~~~~~~~~
In file included from arch/x86/kernel/cpu/mcheck/therm_throt.c:29:
./arch/x86/include/asm/traps.h:107:17: note: previous declaration of \
‘smp_thermal_interrupt’ was here
asmlinkage void smp_thermal_interrupt(void);
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Yi Wang <wang.yi59@zte.com.cn>
Cc: Michael Matz <matz@suse.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1811081633160.1549@nanos.tec.linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
31 lines
768 B
C
31 lines
768 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Common corrected MCE threshold handler code:
|
|
*/
|
|
#include <linux/interrupt.h>
|
|
#include <linux/kernel.h>
|
|
|
|
#include <asm/irq_vectors.h>
|
|
#include <asm/traps.h>
|
|
#include <asm/apic.h>
|
|
#include <asm/mce.h>
|
|
#include <asm/trace/irq_vectors.h>
|
|
|
|
static void default_threshold_interrupt(void)
|
|
{
|
|
pr_err("Unexpected threshold interrupt at vector %x\n",
|
|
THRESHOLD_APIC_VECTOR);
|
|
}
|
|
|
|
void (*mce_threshold_vector)(void) = default_threshold_interrupt;
|
|
|
|
asmlinkage __visible void __irq_entry smp_threshold_interrupt(struct pt_regs *regs)
|
|
{
|
|
entering_irq();
|
|
trace_threshold_apic_entry(THRESHOLD_APIC_VECTOR);
|
|
inc_irq_stat(irq_threshold_count);
|
|
mce_threshold_vector();
|
|
trace_threshold_apic_exit(THRESHOLD_APIC_VECTOR);
|
|
exiting_ack_irq();
|
|
}
|