The patch titled
x86_64: nmi_watchdog fix to be more like i386
has been removed from the -mm tree. Its filename was
x86_64-nmi_watchdog-fix-to-be-more-like-i386.patch
This patch was dropped because it was nacked
------------------------------------------------------
Subject: x86_64: nmi_watchdog fix to be more like i386
From: "David Bahi" <dbahi@xxxxxxxxxx>
Thanks to tglx and ghaskins for all the help in tracking down a very
early nmi_watchdog crash on certain x86_64 machines.
This modifies nmi_watchdog_tick behavior for x86_64 arch to consider both
timer and hpet IRQs just as the i386 arch does.
[akpm@xxxxxxxxxxxxxxxxxxxx: build fix]
Signed-off-by: David Bahi <dbahi@xxxxxxxxxx>
Cc: "Gregory Haskins" <GHaskins@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86_64/kernel/nmi.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff -puN arch/x86_64/kernel/nmi.c~x86_64-nmi_watchdog-fix-to-be-more-like-i386 arch/x86_64/kernel/nmi.c
--- a/arch/x86_64/kernel/nmi.c~x86_64-nmi_watchdog-fix-to-be-more-like-i386
+++ a/arch/x86_64/kernel/nmi.c
@@ -18,6 +18,7 @@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/sysdev.h>
+#include <linux/kernel_stat.h>
#include <linux/sysctl.h>
#include <linux/kprobes.h>
#include <linux/cpumask.h>
@@ -330,7 +331,6 @@ int __kprobes nmi_watchdog_tick(struct p
touched = 1;
}
- sum = read_pda(apic_timer_irqs);
if (smp_processor_id() == 0)
sum += kstat_cpu(cpu).irqs[0];
@@ -349,6 +349,12 @@ int __kprobes nmi_watchdog_tick(struct p
cpu_clear(cpu, backtrace_mask);
}
+ /*
+ * Take the local apic timer and PIT/HPET into account. We don't
+ * know which one is active, when we have highres/dyntick on
+ */
+ sum = read_pda(apic_timer_irqs) + kstat_cpu(cpu).irqs[0];
+
#ifdef CONFIG_X86_MCE
/* Could check oops_in_progress here too, but it's safer
not too */
_
Patches currently in -mm which might be from dbahi@xxxxxxxxxx are
x86_64-nmi_watchdog-fix-to-be-more-like-i386.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
