2023-08-07 07:27:24

by Arnd Bergmann

Subject: [PATCH] nmi_backtrace: fix trigger_allbutcpu_cpu_backtrace() stub definition

From: Arnd Bergmann <[email protected]>

The prototype for the extern declaration was changed, but the one for
the empty stub is now missing an unused argument:

kernel/watchdog.c: In function 'watchdog_timer_fn':
kernel/watchdog.c:521:4: error: too many arguments to function 'trigger_allbutcpu_cpu_backtrace'
521 | trigger_allbutcpu_cpu_backtrace(smp_processor_id());
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from kernel/watchdog.c:17:
include/linux/nmi.h:193:20: note: declared here
193 | static inline bool trigger_allbutcpu_cpu_backtrace(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes: 0ca1d340a231e ("nmi_backtrace: allow excluding an arbitrary CPU")
Signed-off-by: Arnd Bergmann <[email protected]>
---
include/linux/nmi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 7cf7801856a1b..e92e378df000f 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -190,7 +190,7 @@ static inline bool trigger_all_cpu_backtrace(void)
{
return false;
}
-static inline bool trigger_allbutcpu_cpu_backtrace(void)
+static inline bool trigger_allbutcpu_cpu_backtrace(int exclude_cpu)
{
return false;
}
--
2.39.2

2023-08-07 07:29:49

by Thorsten Leemhuis

Subject: Re: [PATCH] nmi_backtrace: fix trigger_allbutcpu_cpu_backtrace() stub definition

On 07.08.23 09:10, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The prototype for the extern declaration was changed, but the one for
> the empty stub is now missing an unused argument:
>
> kernel/watchdog.c: In function 'watchdog_timer_fn':
> kernel/watchdog.c:521:4: error: too many arguments to function 'trigger_allbutcpu_cpu_backtrace'
> 521 | trigger_allbutcpu_cpu_backtrace(smp_processor_id());
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from kernel/watchdog.c:17:
> include/linux/nmi.h:193:20: note: declared here
> 193 | static inline bool trigger_allbutcpu_cpu_backtrace(void)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Thx for this, ran into the same problem while building -next today:
https://copr-be.cloud.fedoraproject.org/results/@kernel-vanilla/next/fedora-rawhide-aarch64/06247267-next-next-all/build.log.gz

FWIW, it seems Andrew had noticed it and a fix ready:
https://lore.kernel.org/all/[email protected]/

Maybe it was just not committed or something?

Ciao, Thorsten

> Fixes: 0ca1d340a231e ("nmi_backtrace: allow excluding an arbitrary CPU")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> include/linux/nmi.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/nmi.h b/include/linux/nmi.h
> index 7cf7801856a1b..e92e378df000f 100644
> --- a/include/linux/nmi.h
> +++ b/include/linux/nmi.h
> @@ -190,7 +190,7 @@ static inline bool trigger_all_cpu_backtrace(void)
> {
> return false;
> }
> -static inline bool trigger_allbutcpu_cpu_backtrace(void)
> +static inline bool trigger_allbutcpu_cpu_backtrace(int exclude_cpu)
> {
> return false;
> }