git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Complete fixes after removal of pt_regs argument to int handlers.
[safe/jmp/linux-2.6]
/
arch
/
mips
/
sgi-ip22
/
ip22-eisa.c
diff --git
a/arch/mips/sgi-ip22/ip22-eisa.c
b/arch/mips/sgi-ip22/ip22-eisa.c
index
ee0514a
..
0d18ed4
100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-eisa.c
+++ b/
arch/mips/sgi-ip22/ip22-eisa.c
@@
-70,7
+70,7
@@
static char __init *decode_eisa_sig(unsigned long addr)
return sig_str;
}
return sig_str;
}
-static irqreturn_t ip22_eisa_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t ip22_eisa_intr(int irq, void *dev_id)
{
u8 eisa_irq;
u8 dma1, dma2;
{
u8 eisa_irq;
u8 dma1, dma2;
@@
-80,7
+80,7
@@
static irqreturn_t ip22_eisa_intr(int irq, void *dev_id, struct pt_regs *regs)
dma2 = inb(EISA_DMA2_STATUS);
if (eisa_irq < EISA_MAX_IRQ) {
dma2 = inb(EISA_DMA2_STATUS);
if (eisa_irq < EISA_MAX_IRQ) {
- do_IRQ(eisa_irq
, regs
);
+ do_IRQ(eisa_irq);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-89,6
+89,7
@@
static irqreturn_t ip22_eisa_intr(int irq, void *dev_id, struct pt_regs *regs)
outb(0x20, EISA_INT2_CTRL);
outb(0x20, EISA_INT1_CTRL);
outb(0x20, EISA_INT2_CTRL);
outb(0x20, EISA_INT1_CTRL);
+
return IRQ_NONE;
}
return IRQ_NONE;
}