Setting tag linux-2.6-22-50

[linux-2.6.git] / linux-2.6-650-hangcheck-reboot.patch

diff --git a/linux-2.6-650-hangcheck-reboot.patch b/linux-2.6-650-hangcheck-reboot.patch
index 398465d..d90a300 100644 (file)
--- a/linux-2.6-650-hangcheck-reboot.patch
+++ b/linux-2.6-650-hangcheck-reboot.patch
@@ -1,6 +1,5 @@
-diff -Nurp linux-2.6.22-640/drivers/char/hangcheck-timer.c linux-2.6.22-650/drivers/char/hangcheck-timer.c
---- linux-2.6.22-640/drivers/char/hangcheck-timer.c    2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-650/drivers/char/hangcheck-timer.c    2008-06-25 14:44:10.000000000 -0400
+--- linux-2.6.22-640/drivers/char/hangcheck-timer.c    2007-07-09 01:32:17.000000000 +0200
++++ linux-2.6.22-650/drivers/char/hangcheck-timer.c    2008-11-25 10:22:00.000000000 +0100
 @@ -57,7 +57,7 @@
  
  static int hangcheck_tick = DEFAULT_IOFENCE_TICK;
@@ -10,3 +9,14 @@ diff -Nurp linux-2.6.22-640/drivers/char/hangcheck-timer.c linux-2.6.22-650/driv
  static int hangcheck_dump_tasks;  /* Defaults to not dumping SysRQ T */
  
  /* options - modular */
+@@ -175,8 +175,8 @@ static void hangcheck_fire(unsigned long
+ 
+ static int __init hangcheck_init(void)
+ {
+-      printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\n",
+-             VERSION_STR, hangcheck_tick, hangcheck_margin);
++      printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds, reboot is %d).\n",
++             VERSION_STR, hangcheck_tick, hangcheck_margin, hangcheck_reboot);
+ #if defined (HAVE_MONOTONIC)
+       printk("Hangcheck: Using monotonic_clock().\n");
+ #else