Skip to contentSkip to conversation

nmi_backtrace: fix trigger_allbutcpu_cpu_backtrace() stub definition

PATCH In review Arnd Bergmann 2 participants 2 messages Aug 7, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 include/linux/nmi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nmi.h +1 -1
index 7cf7801856a1b..e92e378df000f 100644
@@ -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;
 }
Signature · 1 line
2.39.2
#1 lore raw
Quoted 5 lines · Arnd Bergmann

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:

Quoted 8 lines

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

Quoted 19 lines
Fixes 0ca1d340a231e ("nmi_backtrace: allow excluding an arbitrary CPU")
---
 include/linux/nmi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nmi.h +1 -1
index 7cf7801856a1b..e92e378df000f 100644
@@ -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;
 }