lkml.org 
[lkml]   [2018]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH v2] x86/cpu: fix prototype warning
    On Thu, Nov 08, 2018 at 03:47:32PM +0000, Michael Matz wrote:
    > What tglx said. If you don't intend such functions to be called
    > from other units make them static, if you do intend them to be callable
    > declare the properly.

    Well, I'll be damned!

    That just caught two bugs, the smp_thermal_interrupt() is *exactly* what
    the warning is supposed to catch - functions with changed prototype!

    ---
    From: Borislav Petkov <bp@suse.de>
    Date: Fri, 9 Nov 2018 23:13:13 +0100
    Subject: [PATCH] x86/mce: Fix -Wmissing-prototypes warnings
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit

    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>
    ---
    arch/x86/kernel/cpu/mcheck/mce_amd.c | 3 ++-
    arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 ++-
    arch/x86/kernel/cpu/mcheck/threshold.c | 1 +
    3 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
    index dd33c357548f..87499b997039 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
    +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
    @@ -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;
    diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
    index 0d3f6b6a5739..70a05de7ea59 100644
    --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
    +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
    @@ -26,6 +26,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>
    @@ -391,7 +392,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(void)
    {
    entering_irq();
    trace_thermal_apic_entry(THERMAL_APIC_VECTOR);
    diff --git a/arch/x86/kernel/cpu/mcheck/threshold.c b/arch/x86/kernel/cpu/mcheck/threshold.c
    index 2b584b319eff..b0c60beb6312 100644
    --- a/arch/x86/kernel/cpu/mcheck/threshold.c
    +++ b/arch/x86/kernel/cpu/mcheck/threshold.c
    @@ -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>
    --
    2.19.1
    --
    Regards/Gruss,
    Boris.

    Good mailing practices for 400: avoid top-posting and trim the reply.

    \
     
     \ /
      Last update: 2018-11-09 23:18    [W:4.355 / U:1.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site