[LV-k25-commit] CVS: kernel-2.5/kernel panic.c,1.4,1.5

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

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

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


Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- panic.c	29 Jan 2003 01:46:49 -0000	1.4
+++ panic.c	9 Feb 2003 01:37:11 -0000	1.5
@@ -97,7 +97,7 @@
 #ifdef CONFIG_VAX
 	machine_halt();
 #endif
-	sti();
+	local_irq_enable();
 	for(;;) {
 		CHECK_EMERGENCY_SYNC
 	}