| Message ID | 20220727092109.31362-1-ldufour@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | watchdog: Fix build error when CONFIG_SOFTLOCKUP_DETECTOR is not set | expand |
> 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 <sachinp@linux.ibm.com> > Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> > --- > kernel/watchdog.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks Laurent for the fix. Tested-by: Sachin Sant <sachinp@linux.ibm.com> - Sachin
Laurent Dufour <ldufour@linux.ibm.com> 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 <sachinp@linux.ibm.com> > Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> > --- > kernel/watchdog.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks. I'll squash that in to the original commit. cheers
Le 27/07/2022 à 13:38, Michael Ellerman a écrit : > Laurent Dufour <ldufour@linux.ibm.com> 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 <sachinp@linux.ibm.com> >> Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> >> --- >> 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.
Laurent Dufour <ldufour@linux.ibm.com> writes: > Le 27/07/2022 à 13:38, Michael Ellerman a écrit : >> Laurent Dufour <ldufour@linux.ibm.com> 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 <sachinp@linux.ibm.com> >>> Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> >>> --- >>> 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
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(); }
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 <sachinp@linux.ibm.com> Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> --- kernel/watchdog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)