patch-2.4.10 linux/arch/sh/kernel/irq.c
Next file: linux/arch/sh/kernel/irq_imask.c
Previous file: linux/arch/sh/kernel/io_adx.c
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
Sat Sep 8 12:29:09 2001
- Orig file:
v2.4.9/linux/arch/sh/kernel/irq.c
- Orig date:
Tue Jul 3 17:08:18 2001
diff -u --recursive --new-file v2.4.9/linux/arch/sh/kernel/irq.c linux/arch/sh/kernel/irq.c
@@ -1,4 +1,4 @@
-/* $Id: irq.c,v 1.12 2000/03/06 14:07:50 gniibe Exp $
+/* $Id: irq.c,v 1.21 2001/07/17 02:26:53 gniibe Exp $
*
* linux/arch/sh/kernel/irq.c
*
@@ -31,7 +31,6 @@
#include <asm/system.h>
#include <asm/io.h>
#include <asm/bitops.h>
-#include <asm/smp.h>
#include <asm/pgalloc.h>
#include <asm/delay.h>
#include <asm/irq.h>
@@ -399,7 +398,7 @@
spin_lock_irq(&desc->lock);
if (!desc->action)
- desc->handler->startup(i);
+ desc->handler->startup(i);
spin_unlock_irq(&desc->lock);
}
@@ -452,7 +451,6 @@
}
spin_unlock_irq(&desc->lock);
}
- spin_unlock_irq(&desc->lock);
return val;
}
@@ -536,7 +534,7 @@
if (!shared) {
desc->depth = 0;
- desc->status &= ~IRQ_DISABLED;
+ desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING);
desc->handler->startup(irq);
}
spin_unlock_irqrestore(&desc->lock,flags);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)