remove fix-the-softlockup-watchdog-to-actually-work.patch on request of Ingo

diff --git a/review-2.6.22/fix-the-softlockup-watchdog-to-actually-work.patch b/review-2.6.22/fix-the-softlockup-watchdog-to-actually-work.patch
deleted file mode 100644 (file)
index fd1f26c..0000000
--- a/review-2.6.22/fix-the-softlockup-watchdog-to-actually-work.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From stable-bounces@linux.kernel.org Tue Oct 16 23:29:17 2007
-From: Ingo Molnar <mingo@elte.hu>
-Date: Tue, 16 Oct 2007 23:18:38 -0700
-Subject: fix the softlockup watchdog to actually work
-To: torvalds@linux-foundation.org
-Cc: akpm@linux-foundation.org, mingo@elte.hu, jeremy@goop.org, stable@kernel.org
-Message-ID: <200710170618.l9H6IcbE005545@imap1.linux-foundation.org>
-
-
-From: Ingo Molnar <mingo@elte.hu>
-
-patch a115d5caca1a2905ba7a32b408a6042b20179aaa in mainline.
-
-this Xen related commit:
-
-   commit 966812dc98e6a7fcdf759cbfa0efab77500a8868
-   Author: Jeremy Fitzhardinge <jeremy@goop.org>
-   Date:   Tue May 8 00:28:02 2007 -0700
-
-       Ignore stolen time in the softlockup watchdog
-
-broke the softlockup watchdog to never report any lockups. (!)
-
-print_timestamp defaults to 0, this makes the following condition
-always true:
-
-       if (print_timestamp < (touch_timestamp + 1) ||
-
-and we'll in essence never report soft lockups.
-
-apparently the functionality of the soft lockup watchdog was never
-actually tested with that patch applied ...
-
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
-Cc: Jeremy Fitzhardinge <jeremy@goop.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- kernel/softlockup.c |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/kernel/softlockup.c
-+++ b/kernel/softlockup.c
-@@ -79,10 +79,11 @@ void softlockup_tick(void)
-       print_timestamp = per_cpu(print_timestamp, this_cpu);
- 
-       /* report at most once a second */
--      if (print_timestamp < (touch_timestamp + 1) ||
--              did_panic ||
--                      !per_cpu(watchdog_task, this_cpu))
-+      if ((print_timestamp >= touch_timestamp &&
-+                      print_timestamp < (touch_timestamp + 1)) ||
-+                      did_panic || !per_cpu(watchdog_task, this_cpu)) {
-               return;
-+      }
- 
-       /* do not print during early bootup: */
-       if (unlikely(system_state != SYSTEM_RUNNING)) {

diff --git a/review-2.6.22/series b/review-2.6.22/series
index ddd4c7c22f0e7310d70818e8357e0b6334d5ce1e..3220eadfcb3cc4fa498f9cccd86c8af8699e7adf 100644 (file)
--- a/review-2.6.22/series
+++ b/review-2.6.22/series
@@ -4,7 +4,6 @@ x86-fix-tsc-clock-source-calibration-error.patch
 writeback-don-t-propagate-aop_writepage_activate.patch
 fix-param_sysfs_builtin-name-length-check.patch
 netfilter-nf_conntrack_tcp-fix-connection-reopening.patch
-fix-the-softlockup-watchdog-to-actually-work.patch
 fix-teql-oops.patch
 fix-netlink-timeouts.patch
 fix-error-returns-in-sys_socketpair.patch