2019-03-12 20:19:31

by Mathieu Malaterre

Subject: [PATCH] powerpc/64s: Include <asm/nmi.h> header file to fix a warning

Make sure to include <asm/nmi.h> to provide the following prototype:
hv_nmi_check_nonrecoverable.

Remove the following warning treated as error (W=1):

arch/powerpc/kernel/traps.c:393:6: error: no previous prototype for 'hv_nmi_check_nonrecoverable' [-Werror=missing-prototypes]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
arch/powerpc/kernel/traps.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index a21200c6aaea..1fd45a8650e1 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -71,6 +71,7 @@
#include <sysdev/fsl_pci.h>
#include <asm/kprobes.h>
#include <asm/stacktrace.h>
+#include <asm/nmi.h>

#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)
int (*__debugger)(struct pt_regs *regs) __read_mostly;
--
2.20.1

2019-03-12 21:13:08

by Christophe Leroy

Subject: Re: [PATCH] powerpc/64s: Include <asm/nmi.h> header file to fix a warning

Le 12/03/2019 à 21:18, Mathieu Malaterre a écrit :
> Make sure to include <asm/nmi.h> to provide the following prototype:
> hv_nmi_check_nonrecoverable.
>
> Remove the following warning treated as error (W=1):
>
> arch/powerpc/kernel/traps.c:393:6: error: no previous prototype for 'hv_nmi_check_nonrecoverable' [-Werror=missing-prototypes]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>

Reviewed-by: Christophe Leroy <[email protected]>

> ---
> arch/powerpc/kernel/traps.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index a21200c6aaea..1fd45a8650e1 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -71,6 +71,7 @@
> #include <sysdev/fsl_pci.h>
> #include <asm/kprobes.h>
> #include <asm/stacktrace.h>
> +#include <asm/nmi.h>
>
> #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)
> int (*__debugger)(struct pt_regs *regs) __read_mostly;
>

2019-03-14 11:44:55

by Michael Ellerman

Subject: Re: powerpc/64s: Include <asm/nmi.h> header file to fix a warning

On Tue, 2019-03-12 at 20:18:23 UTC, Mathieu Malaterre wrote:
> Make sure to include <asm/nmi.h> to provide the following prototype:
> hv_nmi_check_nonrecoverable.
>
> Remove the following warning treated as error (W=1):
>
> arch/powerpc/kernel/traps.c:393:6: error: no previous prototype for 'hv_nmi_check_nonrecoverable' [-Werror=missing-prototypes]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>
> Reviewed-by: Christophe Leroy <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/de3c83c2fd2b87cf68214eda76dfa669

cheers