The patch titled
Subject: kernel/watchdog: change prototype of watchdog_nmi_enable()
has been added to the -mm tree. Its filename is
kernel-watchdog-change-prototype-of-watchdog_nmi_enable.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/kernel-watchdog-change-prototype-of-watchdog_nmi_enable.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/kernel-watchdog-change-prototype-of-watchdog_nmi_enable.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Pingfan Liu <kernelfans@xxxxxxxxx>
Subject: kernel/watchdog: change prototype of watchdog_nmi_enable()
The only caller does not handle the return value of watchdog_nmi_enable().
If there is an error, it seems to be reported by arch specific code.
Hence change watchdog_nmi_enable() return value from int to void.
Link: https://lkml.kernel.org/r/20210824031435.9664-1-kernelfans@xxxxxxxxx
Signed-off-by: Pingfan Liu <kernelfans@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxxx>
Cc: Wang Qing <wangqing@xxxxxxxx>
Cc: Santosh Sivaraj <santosh@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/sparc/kernel/nmi.c | 8 +++-----
include/linux/nmi.h | 2 +-
kernel/watchdog.c | 3 +--
3 files changed, 5 insertions(+), 8 deletions(-)
--- a/arch/sparc/kernel/nmi.c~kernel-watchdog-change-prototype-of-watchdog_nmi_enable
+++ a/arch/sparc/kernel/nmi.c
@@ -282,11 +282,11 @@ __setup("nmi_watchdog=", setup_nmi_watch
* sparc specific NMI watchdog enable function.
* Enables watchdog if it is not enabled already.
*/
-int watchdog_nmi_enable(unsigned int cpu)
+void watchdog_nmi_enable(unsigned int cpu)
{
if (atomic_read(&nmi_active) == -1) {
pr_warn("NMI watchdog cannot be enabled or disabled\n");
- return -1;
+ return;
}
/*
@@ -295,11 +295,9 @@ int watchdog_nmi_enable(unsigned int cpu
* process first.
*/
if (!nmi_init_done)
- return 0;
+ return;
smp_call_function_single(cpu, start_nmi_watchdog, NULL, 1);
-
- return 0;
}
/*
* sparc specific NMI watchdog disable function.
--- a/include/linux/nmi.h~kernel-watchdog-change-prototype-of-watchdog_nmi_enable
+++ a/include/linux/nmi.h
@@ -119,7 +119,7 @@ static inline int hardlockup_detector_pe
void watchdog_nmi_stop(void);
void watchdog_nmi_start(void);
int watchdog_nmi_probe(void);
-int watchdog_nmi_enable(unsigned int cpu);
+void watchdog_nmi_enable(unsigned int cpu);
void watchdog_nmi_disable(unsigned int cpu);
/**
--- a/kernel/watchdog.c~kernel-watchdog-change-prototype-of-watchdog_nmi_enable
+++ a/kernel/watchdog.c
@@ -95,10 +95,9 @@ __setup("nmi_watchdog=", hardlockup_pani
* softlockup watchdog start and stop. The arch must select the
* SOFTLOCKUP_DETECTOR Kconfig.
*/
-int __weak watchdog_nmi_enable(unsigned int cpu)
+void __weak watchdog_nmi_enable(unsigned int cpu)
{
hardlockup_detector_perf_enable();
- return 0;
}
void __weak watchdog_nmi_disable(unsigned int cpu)
_
Patches currently in -mm which might be from kernelfans@xxxxxxxxx are
kernel-watchdog-change-prototype-of-watchdog_nmi_enable.patch
