2022-07-27 09:31:17

by Laurent Dufour

Subject: [PATCH] watchdog: Fix build error when CONFIG_SOFTLOCKUP_DETECTOR is not set

Sachin reported the following build error when CONFIG_SOFTLOCKUP_DETECTOR
is not set:

kernel/watchdog.c:597:20: error: static declaration of 'lockup_detector_reconfigure' follows non-static declaration
static inline void lockup_detector_reconfigure(void)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from kernel/watchdog.c:17:
./include/linux/nmi.h:125:6: note: previous declaration of 'lockup_detector_reconfigure' was here
void lockup_detector_reconfigure(void);
^~~~~~~~~~~~~~~~~~~~~~~~~~~

The definition of lockup_detector_reconfigure should be exported even in
that case, and __lockup_detector_reconfigure should remain static.

Fixes: 24a1260705b7 ("watchdog: export lockup_detector_reconfigure")
Reported-by: Sachin Sant <[email protected]>
Signed-off-by: Laurent Dufour <[email protected]>
---
kernel/watchdog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 90e6c41d5e33..41596c415111 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -590,7 +590,7 @@ static __init void lockup_detector_setup(void)
}

#else /* CONFIG_SOFTLOCKUP_DETECTOR */
-void __lockup_detector_reconfigure(void)
+static void __lockup_detector_reconfigure(void)
{
cpus_read_lock();
watchdog_nmi_stop();
@@ -598,7 +598,7 @@ void __lockup_detector_reconfigure(void)
watchdog_nmi_start();
cpus_read_unlock();
}
-static inline void lockup_detector_reconfigure(void)
+void lockup_detector_reconfigure(void)
{
__lockup_detector_reconfigure();
}
--
2.37.1

2022-07-27 10:23:22

by Sachin Sant

Subject: Re: [PATCH] watchdog: Fix build error when CONFIG_SOFTLOCKUP_DETECTOR is not set

> The definition of lockup_detector_reconfigure should be exported even in
> that case, and __lockup_detector_reconfigure should remain static.
>
> Fixes: 24a1260705b7 ("watchdog: export lockup_detector_reconfigure")
> Reported-by: Sachin Sant <[email protected]>
> Signed-off-by: Laurent Dufour <[email protected]>
> ---
> kernel/watchdog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks Laurent for the fix.

Tested-by: Sachin Sant <[email protected]>


- Sachin

2022-07-27 12:12:45

by Michael Ellerman

Subject: Re: [PATCH] watchdog: Fix build error when CONFIG_SOFTLOCKUP_DETECTOR is not set

Laurent Dufour <[email protected]> writes:
> Sachin reported the following build error when CONFIG_SOFTLOCKUP_DETECTOR
> is not set:
>
> kernel/watchdog.c:597:20: error: static declaration of 'lockup_detector_reconfigure' follows non-static declaration
> static inline void lockup_detector_reconfigure(void)
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from kernel/watchdog.c:17:
> ./include/linux/nmi.h:125:6: note: previous declaration of 'lockup_detector_reconfigure' was here
> void lockup_detector_reconfigure(void);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> The definition of lockup_detector_reconfigure should be exported even in
> that case, and __lockup_detector_reconfigure should remain static.
>
> Fixes: 24a1260705b7 ("watchdog: export lockup_detector_reconfigure")
> Reported-by: Sachin Sant <[email protected]>
> Signed-off-by: Laurent Dufour <[email protected]>
> ---
> kernel/watchdog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks.

I'll squash that in to the original commit.

cheers

2022-07-27 14:25:39

by Laurent Dufour

Subject: Re: [PATCH] watchdog: Fix build error when CONFIG_SOFTLOCKUP_DETECTOR is not set

Le 27/07/2022 à 13:38, Michael Ellerman a écrit :
> Laurent Dufour <[email protected]> writes:
>> Sachin reported the following build error when CONFIG_SOFTLOCKUP_DETECTOR
>> is not set:
>>
>> kernel/watchdog.c:597:20: error: static declaration of 'lockup_detector_reconfigure' follows non-static declaration
>> static inline void lockup_detector_reconfigure(void)
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from kernel/watchdog.c:17:
>> ./include/linux/nmi.h:125:6: note: previous declaration of 'lockup_detector_reconfigure' was here
>> void lockup_detector_reconfigure(void);
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> The definition of lockup_detector_reconfigure should be exported even in
>> that case, and __lockup_detector_reconfigure should remain static.
>>
>> Fixes: 24a1260705b7 ("watchdog: export lockup_detector_reconfigure")
>> Reported-by: Sachin Sant <[email protected]>
>> Signed-off-by: Laurent Dufour <[email protected]>
>> ---
>> kernel/watchdog.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Thanks.
>
> I'll squash that in to the original commit.

Thanks Michael,

I was thinking this is too late for such a squash.

Laurent.

2022-07-28 03:44:55

by Michael Ellerman

Subject: Re: [PATCH] watchdog: Fix build error when CONFIG_SOFTLOCKUP_DETECTOR is not set

Laurent Dufour <[email protected]> writes:
> Le 27/07/2022 à 13:38, Michael Ellerman a écrit :
>> Laurent Dufour <[email protected]> writes:
>>> Sachin reported the following build error when CONFIG_SOFTLOCKUP_DETECTOR
>>> is not set:
>>>
>>> kernel/watchdog.c:597:20: error: static declaration of 'lockup_detector_reconfigure' follows non-static declaration
>>> static inline void lockup_detector_reconfigure(void)
>>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> In file included from kernel/watchdog.c:17:
>>> ./include/linux/nmi.h:125:6: note: previous declaration of 'lockup_detector_reconfigure' was here
>>> void lockup_detector_reconfigure(void);
>>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>
>>> The definition of lockup_detector_reconfigure should be exported even in
>>> that case, and __lockup_detector_reconfigure should remain static.
>>>
>>> Fixes: 24a1260705b7 ("watchdog: export lockup_detector_reconfigure")
>>> Reported-by: Sachin Sant <[email protected]>
>>> Signed-off-by: Laurent Dufour <[email protected]>
>>> ---
>>> kernel/watchdog.c | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> Thanks.
>>
>> I'll squash that in to the original commit.
>
> Thanks Michael,
>
> I was thinking this is too late for such a squash.

It usually would be, if I was organised, so sending a follow-up was the
correct thing for you to do :)

cheers