[parisc-linux-cvs] set oops_in_progress=1 during a crash

[Helge Deller]

--Boundary-00=_XbPG/tylV9Rl01Q
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Saturday 19 July 2003 09:41, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux-2.5
> Changes by:	deller	03/07/19 01:41:10
>
> Modified files:
> 	arch/parisc/kernel: traps.c
>
> Log message:
> adding "oops_in_progress=1", which should acordingly to printk.c
> make sure, that we can't deadlock if a crash is occurring.


--Boundary-00=_XbPG/tylV9Rl01Q
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="diff"

Index: traps.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/traps.c,v
retrieving revision 1.25
diff -u -p -r1.25 traps.c
--- traps.c	28 Jun 2003 03:50:27 -0000	1.25
+++ traps.c	19 Jul 2003 07:39:52 -0000
@@ -221,6 +221,8 @@ void die_if_kernel(char *str, struct pt_
 		return;
 	}
 
+	oops_in_progress = 1;
+
 	/* Amuse the user in a SPARC fashion */
 	printk(
 "      _______________________________ \n"
@@ -413,6 +415,8 @@ void transfer_pim_to_trap_frame(struct p
 void parisc_terminate(char *msg, struct pt_regs *regs, int code, unsigned long offset)
 {
 	static spinlock_t terminate_lock = SPIN_LOCK_UNLOCKED;
+
+	oops_in_progress = 1;
 
 	set_eiem(0);
 	local_irq_disable();

--Boundary-00=_XbPG/tylV9Rl01Q--