git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
irq.c
diff --git
a/arch/cris/arch-v32/kernel/irq.c
b/arch/cris/arch-v32/kernel/irq.c
index
c78cc26
..
cc361bf
100644
(file)
--- a/
arch/cris/arch-v32/kernel/irq.c
+++ b/
arch/cris/arch-v32/kernel/irq.c
@@
-6,7
+6,6
@@
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@
-269,7
+268,7
@@
void
crisv32_do_IRQ(int irq, int block, struct pt_regs* regs)
{
/* Interrupts that may not be moved to another CPU and
crisv32_do_IRQ(int irq, int block, struct pt_regs* regs)
{
/* Interrupts that may not be moved to another CPU and
- * are
SA_INTERRUPT
may skip blocking. This is currently
+ * are
IRQF_DISABLED
may skip blocking. This is currently
* only valid for the timer IRQ and the IPI and is used
* for the timer interrupt to avoid watchdog starvation.
*/
* only valid for the timer IRQ and the IPI and is used
* for the timer interrupt to avoid watchdog starvation.
*/
@@
-369,7
+368,7
@@
init_IRQ(void)
/* Point all IRQ's to bad handlers. */
for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {
/* Point all IRQ's to bad handlers. */
for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {
- irq_desc[j].
handler
= &crisv32_irq_type;
+ irq_desc[j].
chip
= &crisv32_irq_type;
set_exception_vector(i, interrupt[j]);
}
set_exception_vector(i, interrupt[j]);
}