[parisc-linux-cvs] 2.5.45-pa3 DIFF

[Grant Grundler]

Grant Grundler wrote:
> Log message:
> 2.5.45-pa3 remove local_irq_enable() from handle_interrupt()

plug the "no interrupts while handling a trap" hole.


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile	1 Nov 2002 16:45:49 -0000	1.21
+++ Makefile	1 Nov 2002 19:05:29 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 5
 SUBLEVEL = 45
-EXTRAVERSION = -pa2
+EXTRAVERSION = -pa3
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
Index: arch/parisc/kernel/traps.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/traps.c,v
retrieving revision 1.14
diff -u -p -r1.14 traps.c
--- arch/parisc/kernel/traps.c	27 Oct 2002 22:08:59 -0000	1.14
+++ arch/parisc/kernel/traps.c	1 Nov 2002 19:05:29 -0000
@@ -461,21 +461,16 @@ void handle_interruption(int code, struc
 	unsigned long fault_space = 0;
 	struct siginfo si;
 
-	if (code == 1)
-	    pdc_console_restart();  /* switch back to pdc if HPMC */
-	else
-	    local_irq_enable();
-
 #if 0
 	printk(KERN_CRIT "Interruption # %d\n", code);
 #endif
 
 	switch(code) {
 
-	case  1:
-		/* High-priority machine check (HPMC) */
+	case  1:	/* High-priority machine check (HPMC) */
+		pdc_console_restart();  /* switch back to pdc */
 		
-		/* set up a new led state on systems shipped with a LED State panel */
+		/* Let User know via LED State panel */
 		pdc_chassis_send_status(PDC_CHASSIS_DIRECT_HPMC);
 		    
 	    	parisc_terminate("High Priority Machine Check (HPMC)",