2018-06-06 19:43:16

by Mathieu Malaterre

Subject: [PATCH] kernel/watchdog: add missing prototypes for weak functions

In commit 73ce0511c436 ("kernel/watchdog.c: move hardlockup detector to
separate file") two new functions were added ‘watchdog_nmi_enable’ and
‘watchdog_nmi_disable’ the functions were changed from static to weak.
In which case expose the function declarations in header file.

Silence the following gcc warnings:

kernel/watchdog.c:109:12: warning: no previous prototype for ‘watchdog_nmi_enable’ [-Wmissing-prototypes]
kernel/watchdog.c:115:13: warning: no previous prototype for ‘watchdog_nmi_disable’ [-Wmissing-prototypes]

Cc: Babu Moger <[email protected]>
Signed-off-by: Mathieu Malaterre <[email protected]>
---
include/linux/nmi.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index b8d868d23e79..50d143995338 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -113,6 +113,8 @@ 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_disable(unsigned int cpu);

/**
* touch_nmi_watchdog - restart NMI watchdog timeout.
--
2.11.0

2018-11-06 20:37:00

by Mathieu Malaterre

Subject: Re: [PATCH] kernel/watchdog: add missing prototypes for weak functions

ping ?
On Wed, Jun 6, 2018 at 9:42 PM Mathieu Malaterre <[email protected]> wrote:
>
> In commit 73ce0511c436 ("kernel/watchdog.c: move hardlockup detector to
> separate file") two new functions were added ‘watchdog_nmi_enable’ and
> ‘watchdog_nmi_disable’ the functions were changed from static to weak.
> In which case expose the function declarations in header file.
>
> Silence the following gcc warnings:
>
> kernel/watchdog.c:109:12: warning: no previous prototype for ‘watchdog_nmi_enable’ [-Wmissing-prototypes]
> kernel/watchdog.c:115:13: warning: no previous prototype for ‘watchdog_nmi_disable’ [-Wmissing-prototypes]
>
> Cc: Babu Moger <[email protected]>
> Signed-off-by: Mathieu Malaterre <[email protected]>
> ---
> include/linux/nmi.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/nmi.h b/include/linux/nmi.h
> index b8d868d23e79..50d143995338 100644
> --- a/include/linux/nmi.h
> +++ b/include/linux/nmi.h
> @@ -113,6 +113,8 @@ 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_disable(unsigned int cpu);
>
> /**
> * touch_nmi_watchdog - restart NMI watchdog timeout.
> --
> 2.11.0
>

2018-11-06 22:34:55

by tip-bot for Vasyl Gomonovych

Subject: [tip:core/urgent] watchdog/core: Add missing prototypes for weak functions

Commit-ID: 81bd415c91eb966118d773dddf254aebf3022411
Gitweb: https://git.kernel.org/tip/81bd415c91eb966118d773dddf254aebf3022411
Author: Mathieu Malaterre <[email protected]>
AuthorDate: Wed, 6 Jun 2018 21:42:32 +0200
Committer: Thomas Gleixner <[email protected]>
CommitDate: Tue, 6 Nov 2018 21:58:00 +0100

watchdog/core: Add missing prototypes for weak functions

The split out of the hard lockup detector exposed two new weak functions,
but no prototypes for them, which triggers the build warning:

kernel/watchdog.c:109:12: warning: no previous prototype for ‘watchdog_nmi_enable’ [-Wmissing-prototypes]
kernel/watchdog.c:115:13: warning: no previous prototype for ‘watchdog_nmi_disable’ [-Wmissing-prototypes]

Add the prototypes.

Fixes: 73ce0511c436 ("kernel/watchdog.c: move hardlockup detector to separate file")
Signed-off-by: Mathieu Malaterre <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Babu Moger <[email protected]>
Cc: [email protected]
Link: https://lkml.kernel.org/r/[email protected]
---
include/linux/nmi.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 08f9247e9827..9003e29cde46 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -119,6 +119,8 @@ 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_disable(unsigned int cpu);

/**
* touch_nmi_watchdog - restart NMI watchdog timeout.