diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 13:08:55 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 13:08:55 +1100 |
| commit | e130bedb7ce718a8eb6b56a3806b96281f618111 (patch) | |
| tree | da5676a4291a79b06da6fe2b005e0058ec03cc2c /include/asm-powerpc | |
| parent | 00557b59c69ce284e5a61bcfcdbcc3dc867cb2da (diff) | |
| parent | 756e7104fefc82e3ebaa5f1da5ba6659c9c1cae5 (diff) | |
Merge git://oak/home/sfr/kernels/iseries/work
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/hw_irq.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/irq.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h index c37b31b9633..26b89d859c5 100644 --- a/include/asm-powerpc/hw_irq.h +++ b/include/asm-powerpc/hw_irq.h @@ -12,7 +12,6 @@ #include <asm/processor.h> extern void timer_interrupt(struct pt_regs *); -extern void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq); #ifdef CONFIG_PPC_ISERIES diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index b3935ea28ff..c9fbcede0ef 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h @@ -429,7 +429,6 @@ extern u64 ppc64_interrupt_controller; #define NR_MASK_WORDS ((NR_IRQS + 31) / 32) /* pedantic: these are long because they are used with set_bit --RR */ extern unsigned long ppc_cached_irq_mask[NR_MASK_WORDS]; -extern unsigned long ppc_lost_interrupts[NR_MASK_WORDS]; extern atomic_t ppc_n_lost_interrupts; #define virt_irq_create_mapping(x) (x) @@ -488,8 +487,8 @@ extern struct thread_info *softirq_ctx[NR_CPUS]; extern void irq_ctx_init(void); extern void call_do_softirq(struct thread_info *tp); -extern int call_handle_IRQ_event(int irq, struct pt_regs *regs, - struct irqaction *action, struct thread_info *tp); +extern int call___do_IRQ(int irq, struct pt_regs *regs, + struct thread_info *tp); #define __ARCH_HAS_DO_SOFTIRQ |