diff options
author | Kyle McMartin <kyle@redhat.com> | 2011-01-10 13:18:32 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2011-01-10 13:18:32 -0500 |
commit | 173354353e0a7bfa2c8d3dcd77e5fee6d9237a32 (patch) | |
tree | 416ce5ceb9cb1ed74bf63ba30fa9ec4b73ebd354 /linux-2.6-debug-nmi-timeout.patch | |
parent | 4f860245a9fd41d35765a0f369ee34a499dc627d (diff) | |
download | kernel-173354353e0a7bfa2c8d3dcd77e5fee6d9237a32.tar.gz kernel-173354353e0a7bfa2c8d3dcd77e5fee6d9237a32.tar.xz kernel-173354353e0a7bfa2c8d3dcd77e5fee6d9237a32.zip |
drop obsolete linux-2.6-debug-nmi-timeout.patch
Diffstat (limited to 'linux-2.6-debug-nmi-timeout.patch')
-rw-r--r-- | linux-2.6-debug-nmi-timeout.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/linux-2.6-debug-nmi-timeout.patch b/linux-2.6-debug-nmi-timeout.patch deleted file mode 100644 index f54d26ae9..000000000 --- a/linux-2.6-debug-nmi-timeout.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 542dee6f43067fa0101b53925aadf1d08c997cd4 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin <kyle@phobos.i.jkkm.org> -Date: Mon, 29 Mar 2010 23:40:27 -0400 -Subject: linux-2.6-debug-nmi-timeout - ---- - arch/x86/kernel/apic/nmi.c | 2 +- - lib/Kconfig.debug | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c -index 8aa65ad..ba7d55e 100644 ---- a/arch/x86/kernel/apic/nmi.c -+++ b/arch/x86/kernel/apic/nmi.c -@@ -439,7 +439,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) - * wait a few IRQs (5 seconds) before doing the oops ... - */ - __this_cpu_inc(alert_counter); -- if (__this_cpu_read(alert_counter) == 5 * nmi_hz) -+ if (__this_cpu_read(alert_counter) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz) - /* - * die_nmi will return ONLY if NOTIFY_STOP happens.. - */ -diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 1fafb4b..963e78b 100644 ---- a/lib/Kconfig.debug -+++ b/lib/Kconfig.debug -@@ -254,6 +254,14 @@ config SCHEDSTATS - application, you can say N to avoid the very slight overhead - this adds. - -+config DEBUG_NMI_TIMEOUT -+ int "Number of seconds before NMI timeout" -+ depends on X86 -+ default 5 -+ help -+ This value is the number of seconds the NMI watchdog will tick -+ before it decides the machine has hung. -+ - config TIMER_STATS - bool "Collect kernel timers statistics" - depends on DEBUG_KERNEL && PROC_FS --- -1.7.0.1 - |