Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 12 Nov 2018 06:24:53 +0100
From:   Ingo Molnar <mingo@kernel.org>
To:     Borislav Petkov <bp@suse.de>
Cc:     hpa@zytor.com, tglx@linutronix.de, wang.yi59@zte.com.cn,
        linux-kernel@vger.kernel.org, matz@suse.de,
        linux-tip-commits@vger.kernel.org
Subject: Re: [tip:ras/core] x86/mce: Fix -Wmissing-prototypes warnings
Message-ID: <20181112052453.GA126795@gmail.com>
References: <alpine.DEB.2.21.1811081633160.1549@nanos.tec.linutronix.de>
 <tip-d813dfb28641306f66cf1e2c3586f39ab4f84b27@git.kernel.org>
 <20181110141647.GA20073@zn.tnic>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20181110141647.GA20073@zn.tnic>
User-Agent: Mutt/1.9.4 (2018-02-28)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


* Borislav Petkov <bp@suse.de> wrote:

> 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
> ---
>  arch/x86/include/asm/traps.h             | 6 +++---
>  arch/x86/kernel/cpu/mcheck/mce_amd.c     | 5 +++--
>  arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
>  arch/x86/kernel/cpu/mcheck/threshold.c   | 3 ++-
>  4 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
> index 3de69330e6c5..9ea54a764a8e 100644
> --- a/arch/x86/include/asm/traps.h
> +++ b/arch/x86/include/asm/traps.h
> @@ -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 *);
> +asmlinkage void smp_threshold_interrupt(struct pt_regs *);
> +asmlinkage void smp_deferred_error_interrupt(struct pt_regs *);

Nit: please use full declarations in prototypes, i.e. 'struct pt_regs 
*regs' or so. Much of traps.h does this wrong so I guess this should be a 
separate cleanup patch.

> +asmlinkage __visible void __irq_entry smp_deferred_error_interrupt(struct pt_regs *r)

> +asmlinkage __visible void __irq_entry smp_threshold_interrupt(struct pt_regs *r)

Please use the canonical name, i.e. 'regs'.

Thanks,

	Ingo