patch-2.4.22 linux-2.4.22/arch/arm/mach-ebsa110/irq.c

• Lines: 27
• Date: 2003-08-25 04:44:39.000000000 -0700
• Orig file: linux-2.4.21/arch/arm/mach-ebsa110/irq.c
• Orig date: 2001-04-12 12:20:31.000000000 -0700

diff -urN linux-2.4.21/arch/arm/mach-ebsa110/irq.c linux-2.4.22/arch/arm/mach-ebsa110/irq.c
@@ -11,6 +11,9 @@
  *   22-08-1998	RMK	Restructured IRQ routines
  */
 #include <linux/init.h>
+#include <linux/stddef.h>
+#include <linux/list.h>
+#include <linux/timer.h>
 
 #include <asm/mach/irq.h>
 #include <asm/hardware.h>
@@ -35,14 +38,14 @@
 	unsigned long flags;
 	int irq;
 
-	save_flags_cli (flags);
+	local_irq_save(flags);
 	__raw_writeb(0xff, IRQ_MCLR);
 	__raw_writeb(0x55, IRQ_MSET);
 	__raw_writeb(0x00, IRQ_MSET);
 	if (__raw_readb(IRQ_MASK) != 0x55)
 		while (1);
 	__raw_writeb(0xff, IRQ_MCLR);	/* clear all interrupt enables */
-	restore_flags (flags);
+	local_irq_restore(flags);
 
 	for (irq = 0; irq < NR_IRQS; irq++) {
 		irq_desc[irq].valid	= 1;