lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 14 Jun 2022 14:28:31 +0800 From: Lecopzer Chen <lecopzer.chen@...iatek.com> To: <linux-arm-kernel@...ts.infradead.org>, <linux-kernel@...r.kernel.org> CC: <pmladek@...e.com>, <acme@...nel.org>, <akpm@...ux-foundation.org>, <alexander.shishkin@...ux.intel.com>, <catalin.marinas@....com>, <davem@...emloft.net>, <jolsa@...hat.com>, <jthierry@...hat.com>, <keescook@...omium.org>, <kernelfans@...il.com>, <lecopzer.chen@...iatek.com>, <linux-mediatek@...ts.infradead.org>, <linux-perf-users@...r.kernel.org>, <mark.rutland@....com>, <masahiroy@...nel.org>, <matthias.bgg@...il.com>, <maz@...nel.org>, <mcgrof@...nel.org>, <mingo@...hat.com>, <namhyung@...nel.org>, <nixiaoming@...wei.com>, <peterz@...radead.org>, <sparclinux@...r.kernel.org>, <sumit.garg@...aro.org>, <wangqing@...o.com>, <will@...nel.org>, <yj.chiang@...iatek.com> Subject: [PATCH v6 2/6] kernel/watchdog: change watchdog_nmi_enable() to void Nobody cares about the return value of watchdog_nmi_enable(), changing its prototype to void. Signed-off-by: Pingfan Liu <kernelfans@...il.com> Signed-off-by: Lecopzer Chen <lecopzer.chen@...iatek.com> Reviewed-by: Petr Mladek <pmladek@...e.com> --- arch/sparc/kernel/nmi.c | 8 +++----- include/linux/nmi.h | 2 +- kernel/watchdog.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index 060fff95a305..5dcf31f7e81f 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c @@ -282,11 +282,11 @@ __setup("nmi_watchdog=", setup_nmi_watchdog); * 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. diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 750c7f395ca9..b7bcd63c36b4 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -119,7 +119,7 @@ static inline int hardlockup_detector_perf_init(void) { return 0; } 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); /** diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 066ad3017767..458737bc4e35 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -93,10 +93,9 @@ __setup("nmi_watchdog=", hardlockup_panic_setup); * 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) -- 2.25.1
Powered by blists - more mailing lists