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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
xtensa
/
kernel
/
irq.c
diff --git
a/arch/xtensa/kernel/irq.c
b/arch/xtensa/kernel/irq.c
index
51f9bed
..
49ef312
100644
(file)
--- a/
arch/xtensa/kernel/irq.c
+++ b/
arch/xtensa/kernel/irq.c
@@
-63,9
+63,7
@@
unsigned int do_IRQ(int irq, struct pt_regs *regs)
sp - sizeof(struct thread_info));
}
#endif
sp - sizeof(struct thread_info));
}
#endif
-
__do_IRQ(irq, regs);
__do_IRQ(irq, regs);
-
irq_exit();
return 1;
irq_exit();
return 1;
@@
-100,7
+98,7
@@
int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
- seq_printf(p, " %14s", irq_desc[i].
handler
->typename);
+ seq_printf(p, " %14s", irq_desc[i].
chip
->typename);
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
@@
-181,7
+179,7
@@
void __init init_IRQ(void)
int i;
for (i=0; i < XTENSA_NR_IRQS; i++)
int i;
for (i=0; i < XTENSA_NR_IRQS; i++)
- irq_desc[i].
handler
= &xtensa_irq_type;
+ irq_desc[i].
chip
= &xtensa_irq_type;
cached_irq_mask = 0;
cached_irq_mask = 0;