rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.5,1.6

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6413

Modified Files:
	linux-2.6-debug-oops-pause.patch 
Log Message:
pause when we get long stack traces too


linux-2.6-debug-oops-pause.patch:
 traps.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-oops-pause.patch	7 Jan 2006 03:46:01 -0000	1.5
+++ linux-2.6-debug-oops-pause.patch	4 Feb 2006 04:39:51 -0000	1.6
@@ -6,8 +6,9 @@
 
 (Wow, I'm really getting desperate for better debug data).
 
---- vanilla/arch/i386/kernel/traps.c	2006-01-02 22:21:10.000000000 -0500
-+++ linux-2.6.15/arch/i386/kernel/traps.c	2006-01-04 23:42:46.000000000 -0500
+diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.15.noarch/arch/i386/kernel/traps.c oops-pause/arch/i386/kernel/traps.c
+--- linux-2.6.15.noarch/arch/i386/kernel/traps.c	2006-02-03 23:31:55.000000000 -0500
++++ oops-pause/arch/i386/kernel/traps.c	2006-02-03 23:35:44.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <linux/utsname.h>
  #include <linux/kprobes.h>
@@ -16,19 +17,39 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs
+@@ -151,6 +152,17 @@ static inline unsigned long print_contex
+ 	return ebp;
+ }
+ 
++void pause_for_two_minutes(void)
++{
++	int i;
++	for (i=120;i>0;i--) {
++		mdelay(1000);
++		touch_nmi_watchdog();
++		printk("Continuing in %d seconds. \r", i);
++	}
++	printk("\n");
++}	
++
+ static void show_trace_log_lvl(struct task_struct *task,
+ 			       unsigned long *stack, char *log_lvl)
+ {
+@@ -176,6 +188,7 @@ static void show_trace_log_lvl(struct ta
+ 		if (!stack)
+ 			break;
+ 		printk(KERN_EMERG " =======================\n");
++		pause_for_two_minutes();
+ 	}
+ }
+ 
+@@ -287,7 +300,8 @@ void show_registers(struct pt_regs *regs
  		}
  	}
  	printk("\n");
-+	{
-+		int i;
-+		for (i=120;i>0;i--) {
-+			mdelay(1000);
-+			touch_nmi_watchdog();
-+			printk("Continuing in %d seconds. \r", i);
-+		}
-+		printk("\n");
-+	}
- }	
+-}	
++	pause_for_two_minutes();
++}
  
  static void handle_BUG(struct pt_regs *regs)
+ {