# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.524   -> 1.525  
#	      kernel/panic.c	1.8     -> 1.9    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/15	haveblue@elm3b96.(none)	1.525
# keep panics from mixing with each other.
# --------------------------------------------
#
diff -Nru a/kernel/panic.c b/kernel/panic.c
--- a/kernel/panic.c	Thu Aug 15 17:03:05 2002
+++ b/kernel/panic.c	Thu Aug 15 17:03:05 2002
@@ -20,6 +20,7 @@
 asmlinkage void sys_sync(void);	/* it's really int */
 
 int panic_timeout;
+static spinlock_t panic_lock = SPIN_LOCK_UNLOCKED;
 
 struct notifier_block *panic_notifier_list;
 
@@ -48,7 +49,8 @@
 #if defined(CONFIG_ARCH_S390)
         unsigned long caller = (unsigned long) __builtin_return_address(0);
 #endif
-
+	
+	spin_lock(&panic_lock);
 	bust_spinlocks(1);
 	va_start(args, fmt);
 	vsprintf(buf, fmt, args);
@@ -61,6 +63,7 @@
 	else
 		sys_sync();
 	bust_spinlocks(0);
+	spin_unlock(&panic_lock);
 
 #ifdef CONFIG_SMP
 	smp_send_stop();