[linuxsh-cvs] CVS: linux/arch/sh/boards/mpc1211 setup.c,1.4,1.5

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/arch/sh/boards/mpc1211
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4439/arch/sh/boards/mpc1211

Modified Files:
	setup.c 
Log Message:
More local IRQ purging, due to generic hardirq locking.



Index: setup.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/mpc1211/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c	5 Feb 2006 21:55:28 -0000	1.4
+++ setup.c	7 Aug 2006 02:22:11 -0000	1.5
@@ -81,9 +81,6 @@
 
 static void disable_mpc1211_irq(unsigned int irq)
 {
-	unsigned long flags;
-
-	save_and_cli(flags);
 	if( irq < 8) {
 		m_irq_mask |= (1 << irq);
 		outb(m_irq_mask,I8259_M_MR);
@@ -91,16 +88,11 @@
 		s_irq_mask |= (1 << (irq - 8));
 		outb(s_irq_mask,I8259_S_MR);
 	}
-	restore_flags(flags);
 
 }
 
 static void enable_mpc1211_irq(unsigned int irq)
 {
-	unsigned long flags;
-
-	save_and_cli(flags);
-
 	if( irq < 8) {
 		m_irq_mask &= ~(1 << irq);
 		outb(m_irq_mask,I8259_M_MR);
@@ -108,7 +100,6 @@
 		s_irq_mask &= ~(1 << (irq - 8));
 		outb(s_irq_mask,I8259_S_MR);
 	}
-	restore_flags(flags);
 }
 
 static inline int mpc1211_irq_real(unsigned int irq)
@@ -132,10 +123,6 @@
 
 static void mask_and_ack_mpc1211(unsigned int irq)
 {
-	unsigned long flags;
-
-	save_and_cli(flags);
-
 	if(irq < 8) {
 		if(m_irq_mask & (1<<irq)){
 		  if(!mpc1211_irq_real(irq)){
@@ -163,7 +150,6 @@
 		outb(0x60+(irq-8),I8259_S_CR); 	/* EOI */
 		outb(0x60+2,I8259_M_CR);
 	}
-	restore_flags(flags);
 }
 
 static void end_mpc1211_irq(unsigned int irq)