| Message ID | 20170620204854.966601-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
On Tue, Jun 20, 2017 at 10:48:44PM +0200, Arnd Bergmann wrote: > watchdog_update_cpus() is defined unconditionally, but only used when > CONFIG_SYSCTL is defined: > > kernel/watchdog.c:608:12: error: 'watchdog_update_cpus' defined but not used [-Werror=unused-function] > > This adds another #ifdef around it. Thanks! Acked-by: Don Zickus <dzickus@redhat.com> > > Fixes: mmotm ("kernel/watchdog: provide watchdog_nmi_reconfigure() for arch watchdogs") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > kernel/watchdog.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/kernel/watchdog.c b/kernel/watchdog.c > index 06cd965f64d2..95361f9f3f40 100644 > --- a/kernel/watchdog.c > +++ b/kernel/watchdog.c > @@ -605,11 +605,13 @@ static void watchdog_disable_all_cpus(void) > } > } > > +#ifdef CONFIG_SYSCTL > static int watchdog_update_cpus(void) > { > return smpboot_update_cpumask_percpu_thread( > &watchdog_threads, &watchdog_cpumask); > } > +#endif > > #else /* SOFTLOCKUP */ > static int watchdog_park_threads(void) > @@ -630,10 +632,12 @@ static void watchdog_disable_all_cpus(void) > { > } > > +#ifdef CONFIG_SYSCTL > static int watchdog_update_cpus(void) > { > return 0; > } > +#endif > > static void set_sample_period(void) > { > -- > 2.9.0 >
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 06cd965f64d2..95361f9f3f40 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -605,11 +605,13 @@ static void watchdog_disable_all_cpus(void) } } +#ifdef CONFIG_SYSCTL static int watchdog_update_cpus(void) { return smpboot_update_cpumask_percpu_thread( &watchdog_threads, &watchdog_cpumask); } +#endif #else /* SOFTLOCKUP */ static int watchdog_park_threads(void) @@ -630,10 +632,12 @@ static void watchdog_disable_all_cpus(void) { } +#ifdef CONFIG_SYSCTL static int watchdog_update_cpus(void) { return 0; } +#endif static void set_sample_period(void) {
watchdog_update_cpus() is defined unconditionally, but only used when CONFIG_SYSCTL is defined: kernel/watchdog.c:608:12: error: 'watchdog_update_cpus' defined but not used [-Werror=unused-function] This adds another #ifdef around it. Fixes: mmotm ("kernel/watchdog: provide watchdog_nmi_reconfigure() for arch watchdogs") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- kernel/watchdog.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.9.0