2023-08-04 14:15:37

by Arnd Bergmann

Subject: [PATCH 1/2] watchdog/hardlockup: avoid unused-function warning

From: Arnd Bergmann <[email protected]>

The newly added hardlockup_all_cpu_backtrace_proc_handler() function is defined
in some configurations that don't actually call it:

kernel/watchdog.c:112:12: error: 'hardlockup_all_cpu_backtrace_proc_handler' defined but not used [-Werror=unused-function]
112 | static int hardlockup_all_cpu_backtrace_proc_handler(struct ctl_table *table, int write,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Hide the definition when either CONFIG_SMP or CONFIG_SYSCTL are disabled and
the function is not actually needed.

Fixes: 838b3b76220d5 ("watchdog/hardlockup: avoid large stack frames in watchdog_hardlockup_check()")
Signed-off-by: Arnd Bergmann <[email protected]>
---
kernel/watchdog.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 25d5627a6580b..0dd6a7acacd97 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -108,6 +108,7 @@ notrace void arch_touch_nmi_watchdog(void)
}
EXPORT_SYMBOL(arch_touch_nmi_watchdog);

+#if defined(CONFIG_SMP) && defined(CONFIG_SYSCTL)
static int hardlockup_all_cpu_backtrace_proc_handler(struct ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
{
@@ -130,6 +131,7 @@ static int hardlockup_all_cpu_backtrace_proc_handler(struct ctl_table *table, in

return ret;
}
+#endif

void watchdog_hardlockup_touch_cpu(unsigned int cpu)
{
--
2.39.2

2023-08-04 15:24:04

by Doug Anderson

Subject: Re: [PATCH 1/2] watchdog/hardlockup: avoid unused-function warning

Hi,

On Fri, Aug 4, 2023 at 6:28 AM Arnd Bergmann <[email protected]> wrote:
>
> From: Arnd Bergmann <[email protected]>
>
> The newly added hardlockup_all_cpu_backtrace_proc_handler() function is defined
> in some configurations that don't actually call it:
>
> kernel/watchdog.c:112:12: error: 'hardlockup_all_cpu_backtrace_proc_handler' defined but not used [-Werror=unused-function]
> 112 | static int hardlockup_all_cpu_backtrace_proc_handler(struct ctl_table *table, int write,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Hide the definition when either CONFIG_SMP or CONFIG_SYSCTL are disabled and
> the function is not actually needed.
>
> Fixes: 838b3b76220d5 ("watchdog/hardlockup: avoid large stack frames in watchdog_hardlockup_check()")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> kernel/watchdog.c | 2 ++
> 1 file changed, 2 insertions(+)

Thanks for the fix. In this case I'll assume that Andrew will drop the
v2 of my patch and replace it with v4 [1], which shouldn't have this
issue.

[4] https://lore.kernel.org/r/20230804065935.v4.2.I501ab68cb926ee33a7c87e063d207abf09b9943c@changeid