[LV-k25-commit] kernel-2.5/kernel panic.c,1.12,1.13

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17749/kernel

Modified Files:
	panic.c 
Log Message:
Merge with 2.6.9


Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- panic.c	25 Mar 2004 00:15:50 -0000	1.12
+++ panic.c	17 Nov 2004 00:24:36 -0000	1.13
@@ -59,13 +59,7 @@
 	va_start(args, fmt);
 	vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
-	printk(KERN_EMERG "Kernel panic: %s\n",buf);
-	if (in_interrupt())
-		printk(KERN_EMERG "In interrupt handler - not syncing\n");
-	else if (!current->pid)
-		printk(KERN_EMERG "In idle task - not syncing\n");
-	else
-		sys_sync();
+	printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
 	bust_spinlocks(0);
 
 #ifdef CONFIG_SMP