The patch titled
Subject: kernel/watchdog.c: fix watchdog_nmi_enable_all()
has been removed from the -mm tree. Its filename was
watchdog-fix-watchdog_nmi_enable_all.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Subject: kernel/watchdog.c: fix watchdog_nmi_enable_all()
The 'watchdog_user_enabled' variable is only used as an 'interface' to the
/proc/sys/kernel/watchdog parameter. The actual state of the watchdog is
tracked by bits in the 'watchdog_enabled' variable. So,
watchdog_nmi_enable_all() should check the NMI_WATCHDOG_ENABLED bit in
'watchdog_enabled'.
This patch improves code consistency - there are no userspace-visible
changes.
Signed-off-by: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/watchdog.c~watchdog-fix-watchdog_nmi_enable_all kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-fix-watchdog_nmi_enable_all
+++ a/kernel/watchdog.c
@@ -608,7 +608,7 @@ void watchdog_nmi_enable_all(void)
{
int cpu;
- if (!watchdog_user_enabled)
+ if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED))
return;
get_online_cpus();
_
Patches currently in -mm which might be from uobergfe@xxxxxxxxxx are
smpboot-allow-excluding-cpus-from-the-smpboot-threads.patch
smpboot-allow-excluding-cpus-from-the-smpboot-threads-fix.patch
watchdog-add-watchdog_cpumask-sysctl-to-assist-nohz.patch
watchdog-add-watchdog_cpumask-sysctl-to-assist-nohz-fix-2.patch
procfs-treat-parked-tasks-as-sleeping-for-task-state.patch
linux-next.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
