diff --git a/kernel.spec b/kernel.spec
index f3b802cbd..dfb97101b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -610,7 +610,6 @@ Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
 Patch161: linux-2.6-i386-nx-emulation.patch
 
 Patch200: linux-2.6-debug-sizeof-structs.patch
-#Patch201: linux-2.6-debug-nmi-timeout.patch
 Patch202: linux-2.6-debug-taint-vm.patch
 Patch203: linux-2.6-debug-vm-would-have-oomkilled.patch
 Patch204: linux-2.6-debug-always-inline-kzalloc.patch
@@ -1197,7 +1196,6 @@ ApplyPatch acpi-update-battery-information-on-notification-0x81.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
-#ApplyPatch linux-2.6-debug-nmi-timeout.patch
 ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
@@ -1954,6 +1952,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com>
+- Drop obsolete linux-2.6-debug-nmi-timeout.patch
+
 * Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git4.1
 - Branch for 2.6.38
 - Rebase trivial patches.
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
-