The patch titled
Subject: watchdog: move watchdog_disable_all_cpus() outside of ifdef
has been added to the -mm tree. Its filename is
watchdog-move-watchdog_disable_all_cpus-outside-of-ifdef.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/watchdog-move-watchdog_disable_all_cpus-outside-of-ifdef.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/watchdog-move-watchdog_disable_all_cpus-outside-of-ifdef.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Subject: watchdog: move watchdog_disable_all_cpus() outside of ifdef
Move watchdog_disable_all_cpus() outside of the ifdef so that it is
available if CONFIG_SYSCTL is not defined. This is preparation for
"watchdog: implement error handling in update_watchdog_all_cpus() and
callers".
Signed-off-by: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Reviewed-by: Aaron Tomlin <atomlin@xxxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff -puN kernel/watchdog.c~watchdog-move-watchdog_disable_all_cpus-outside-of-ifdef kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-move-watchdog_disable_all_cpus-outside-of-ifdef
+++ a/kernel/watchdog.c
@@ -347,6 +347,9 @@ static void watchdog_interrupt_count(voi
static int watchdog_nmi_enable(unsigned int cpu);
static void watchdog_nmi_disable(unsigned int cpu);
+static int watchdog_enable_all_cpus(void);
+static void watchdog_disable_all_cpus(void);
+
/* watchdog kicker functions */
static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
{
@@ -756,9 +759,6 @@ static int watchdog_enable_all_cpus(void
return err;
}
-/* prepare/enable/disable routines */
-/* sysctl functions */
-#ifdef CONFIG_SYSCTL
static void watchdog_disable_all_cpus(void)
{
if (watchdog_running) {
@@ -767,6 +767,8 @@ static void watchdog_disable_all_cpus(vo
}
}
+#ifdef CONFIG_SYSCTL
+
/*
* Update the run state of the lockup detectors.
*/
_
Patches currently in -mm which might be from uobergfe@xxxxxxxxxx are
watchdog-fix-error-handling-in-proc_watchdog_thresh.patch
watchdog-move-watchdog_disable_all_cpus-outside-of-ifdef.patch
watchdog-implement-error-handling-in-update_watchdog_all_cpus-and-callers.patch
watchdog-implement-error-handling-in-lockup_detector_suspend.patch
watchdog-do-not-unpark-threads-in-watchdog_park_threads-on-error.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
