The patch titled
Subject: kernel/watchdog: hide unused function
has been removed from the -mm tree. Its filename was
watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix-2.patch
This patch was dropped because it was folded into watchdog-provide-watchdog_reconfigure-for-arch-watchdogs.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: kernel/watchdog: hide unused function
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")
Link: http://lkml.kernel.org/r/20170620204854.966601-1-arnd@xxxxxxxx
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Babu Moger <babu.moger@xxxxxxxxxx>
Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
Cc: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN kernel/watchdog.c~watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix-2 kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix-2
+++ a/kernel/watchdog.c
@@ -620,11 +620,13 @@ static void watchdog_disable_all_cpus(vo
}
}
+#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)
@@ -645,10 +647,12 @@ static void watchdog_disable_all_cpus(vo
{
}
+#ifdef CONFIG_SYSCTL
static int watchdog_update_cpus(void)
{
return 0;
}
+#endif
static void set_sample_period(void)
{
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
watchdog-provide-watchdog_reconfigure-for-arch-watchdogs.patch
include-linux-stringh-add-the-option-of-fortified-stringh-functions-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
