aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/xics.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-27 21:47:17 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-27 21:47:17 -0400
commit2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce (patch)
tree30075f5875adcb6fa6d9dd208d5f9851825f564c /arch/ppc64/kernel/xics.c
parenta8e3d48150d70ceab3b8249a4bdbe5c50567a357 (diff)
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>
Diffstat (limited to 'arch/ppc64/kernel/xics.c')
-rw-r--r--arch/ppc64/kernel/xics.c7
1 files changed, 3 insertions, 4 deletions
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 @@
28#include <asm/xics.h> 28#include <asm/xics.h>
29#include <asm/hvcall.h> 29#include <asm/hvcall.h>
30#include <asm/machdep.h> 30#include <asm/machdep.h>
31 31#include <asm/i8259.h>
32#include "i8259.h"
33 32
34static unsigned int xics_startup(unsigned int irq); 33static unsigned int xics_startup(unsigned int irq);
35static void xics_enable_irq(unsigned int irq); 34static void xics_enable_irq(unsigned int irq);
@@ -366,7 +365,7 @@ int xics_get_irq(struct pt_regs *regs)
366 365
367 /* for sanity, this had better be < NR_IRQS - 16 */ 366 /* for sanity, this had better be < NR_IRQS - 16 */
368 if (vec == xics_irq_8259_cascade_real) { 367 if (vec == xics_irq_8259_cascade_real) {
369 irq = i8259_irq(cpu); 368 irq = i8259_irq(regs);
370 if (irq == -1) { 369 if (irq == -1) {
371 /* Spurious cascaded interrupt. Still must ack xics */ 370 /* Spurious cascaded interrupt. Still must ack xics */
372 xics_end_irq(irq_offset_up(xics_irq_8259_cascade)); 371 xics_end_irq(irq_offset_up(xics_irq_8259_cascade));
@@ -589,7 +588,7 @@ static int __init xics_setup_i8259(void)
589 no_action, 0, "8259 cascade", NULL)) 588 no_action, 0, "8259 cascade", NULL))
590 printk(KERN_ERR "xics_setup_i8259: couldn't get 8259 " 589 printk(KERN_ERR "xics_setup_i8259: couldn't get 8259 "
591 "cascade\n"); 590 "cascade\n");
592 i8259_init(0); 591 i8259_init(0, 0);
593 } 592 }
594 return 0; 593 return 0;
595} 594}