[LV-commit] kernel-2.5/kernel panic.c,1.8,1.9

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

Update of /cvsroot/linux-vax/kernel-2.5/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv9270/kernel

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


Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- panic.c	27 Aug 2003 23:47:23 -0000	1.8
+++ panic.c	28 Aug 2003 22:37:30 -0000	1.9
@@ -99,9 +99,8 @@
 	machine_halt();
 #endif
 	local_irq_enable();
-	for(;;) {
-		CHECK_EMERGENCY_SYNC
-	}
+	for (;;)
+		;
 }
 
 /**
@@ -114,7 +113,7 @@
  *	The string is overwritten by the next call to print_taint().
  */
  
-const char *print_tainted()
+const char *print_tainted(void)
 {
 	static char buf[20];
 	if (tainted) {