The patch titled
x86_64: nmi_watchdog fix to be more like i386
has been added to the -mm tree. Its filename is
x86_64-nmi_watchdog-fix-to-be-more-like-i386.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
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.
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 | 7 ++++++-
1 file changed, 6 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
@@ -329,7 +329,6 @@ int __kprobes nmi_watchdog_tick(struct p
touched = 1;
}
- sum = read_pda(apic_timer_irqs);
if (__get_cpu_var(nmi_touch)) {
__get_cpu_var(nmi_touch) = 0;
touched = 1;
@@ -345,6 +344,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
