diff options
| author |   Paul Mackerras <paulus@samba.org> | 2005-10-28 11:47:17 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-28 11:47:17 +1000 |
| commit | 2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce (patch) | |
| tree | 30075f5875adcb6fa6d9dd208d5f9851825f564c | |
| parent | [PATCH] powerpc: Remove dregs of bootinfo.h (diff) | |
| download | linux-dev-2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce.tar.xz linux-dev-2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce.zip | |
ppc64: Use the correct prototypes for i8259 functions
We still had an old copy of i8259.h lying around; this gets rid of it
and corrects the callers of i8259_init and i8259_irq.
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc64/kernel/i8259.h | 17 | ||||
| -rw-r--r-- | arch/ppc64/kernel/xics.c | 7 |
2 files changed, 3 insertions, 21 deletions
diff --git a/arch/ppc64/kernel/i8259.h b/arch/ppc64/kernel/i8259.h deleted file mode 100644 index f74764ba0bfa..000000000000 --- a/arch/ppc64/kernel/i8259.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * c 2001 PPC 64 Team, IBM Corp - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ -#ifndef _PPC_KERNEL_i8259_H -#define _PPC_KERNEL_i8259_H - -extern struct hw_interrupt_type i8259_pic; - -extern void i8259_init(int offset); -extern int i8259_irq(int); - -#endif /* _PPC_KERNEL_i8259_H */ diff --git a/arch/ppc64/kernel/xics.c b/arch/ppc64/kernel/xics.c index daf93885dcfa..a32207dcf2e3 100644 --- a/arch/ppc64/kernel/xics.c +++ b/arch/ppc64/kernel/xics.c @@ -28,8 +28,7 @@ #include <asm/xics.h> #include <asm/hvcall.h> #include <asm/machdep.h> - -#include "i8259.h" +#include <asm/i8259.h> static unsigned int xics_startup(unsigned int irq); static void xics_enable_irq(unsigned int irq); @@ -366,7 +365,7 @@ int xics_get_irq(struct pt_regs *regs) /* for sanity, this had better be < NR_IRQS - 16 */ if (vec == xics_irq_8259_cascade_real) { - irq = i8259_irq(cpu); + irq = i8259_irq(regs); if (irq == -1) { /* Spurious cascaded interrupt. Still must ack xics */ xics_end_irq(irq_offset_up(xics_irq_8259_cascade)); @@ -589,7 +588,7 @@ static int __init xics_setup_i8259(void) no_action, 0, "8259 cascade", NULL)) printk(KERN_ERR "xics_setup_i8259: couldn't get 8259 " "cascade\n"); - i8259_init(0); + i8259_init(0, 0); } return 0; } |