Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
kernel/watchdog.c between commit ab992dc38f9a ("watchdog: Fix merge
'conflict'") from Linus' tree and commit fbfec4606e07
("kernel/watchdog.c: fix watchdog_nmi_enable_all()") from the
akpm-current tree.
I fixed it up (the latter is a subset of the former, so I used that -
see below) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc kernel/watchdog.c
index 506edcc500c4,93ef2bad457c..000000000000
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@@ -610,36 -615,26 +617,36 @@@ void watchdog_nmi_enable_all(void
{
int cpu;
+ mutex_lock(&watchdog_proc_mutex);
+
if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED))
- return;
+ goto unlock;
get_online_cpus();
- for_each_online_cpu(cpu)
+ for_each_watchdog_cpu(cpu)
watchdog_nmi_enable(cpu);
put_online_cpus();
+
+unlock:
+ mutex_lock(&watchdog_proc_mutex);
}
void watchdog_nmi_disable_all(void)
{
int cpu;
+ mutex_lock(&watchdog_proc_mutex);
+
if (!watchdog_running)
- return;
+ goto unlock;
get_online_cpus();
- for_each_online_cpu(cpu)
+ for_each_watchdog_cpu(cpu)
watchdog_nmi_disable(cpu);
put_online_cpus();
+
+unlock:
+ mutex_unlock(&watchdog_proc_mutex);
}
#else
static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
Attachment:
pgpuc5uxQ8o08.pgp
Description: OpenPGP digital signature
