Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff3c3ca3 authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

x86/mce: Fix -Wmissing-prototypes warnings 



[ Upstream commit 68b5e4326e4b8ac9080835005d8254fed0fb3c56 ]

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: default avatarBorislav 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: default avatarSasha Levin <sashal@kernel.org>
parent a72a4f82

arch/x86/include/asm/traps.h

+3 −3
Original line number Diff line number Diff line
@@ -104,9 +104,9 @@ extern int panic_on_unrecovered_nmi; 


void math_emulate(struct math_emu_info *);

#ifndef CONFIG_X86_32

asmlinkage void smp_thermal_interrupt(void);

asmlinkage void smp_threshold_interrupt(void);

asmlinkage void smp_deferred_error_interrupt(void);

asmlinkage void smp_thermal_interrupt(struct pt_regs *regs);

asmlinkage void smp_threshold_interrupt(struct pt_regs *regs);

asmlinkage void smp_deferred_error_interrupt(struct pt_regs *regs);

#endif



extern void ist_enter(struct pt_regs *regs);

arch/x86/kernel/cpu/mcheck/mce_amd.c

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/string.h>



#include <asm/amd_nb.h>

#include <asm/traps.h>

#include <asm/apic.h>

#include <asm/mce.h>

#include <asm/msr.h>
@@ -99,7 +100,7 @@ static u32 smca_bank_addrs[MAX_NR_BANKS][NR_BLOCKS] __ro_after_init = 
	[0 ... MAX_NR_BANKS - 1] = { [0 ... NR_BLOCKS - 1] = -1 }

};



const char *smca_get_name(enum smca_bank_types t)

static const char *smca_get_name(enum smca_bank_types t)

{

	if (t >= N_SMCA_BANK_TYPES)

		return NULL;
@@ -823,7 +824,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc) 
	mce_log(&m);

}



asmlinkage __visible void __irq_entry smp_deferred_error_interrupt(void)

asmlinkage __visible void __irq_entry smp_deferred_error_interrupt(struct pt_regs *regs)

{

	entering_irq();

	trace_deferred_error_apic_entry(DEFERRED_ERROR_VECTOR);

arch/x86/kernel/cpu/mcheck/therm_throt.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/cpu.h>



#include <asm/processor.h>

#include <asm/traps.h>

#include <asm/apic.h>

#include <asm/mce.h>

#include <asm/msr.h>
@@ -390,7 +391,7 @@ static void unexpected_thermal_interrupt(void) 


static void (*smp_thermal_vector)(void) = unexpected_thermal_interrupt;



asmlinkage __visible void __irq_entry smp_thermal_interrupt(struct pt_regs *r)

asmlinkage __visible void __irq_entry smp_thermal_interrupt(struct pt_regs *regs)

{

	entering_irq();

	trace_thermal_apic_entry(THERMAL_APIC_VECTOR);

arch/x86/kernel/cpu/mcheck/threshold.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#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>
@@ -18,7 +19,7 @@ static void default_threshold_interrupt(void) 


void (*mce_threshold_vector)(void) = default_threshold_interrupt;



asmlinkage __visible void __irq_entry smp_threshold_interrupt(void)

asmlinkage __visible void __irq_entry smp_threshold_interrupt(struct pt_regs *regs)

{

	entering_irq();

	trace_threshold_apic_entry(THRESHOLD_APIC_VECTOR);