summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-09 12:46:52 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 14:19:07 -0700
commit041a6baec5a9260ad8b71c43a7ea1de95dfa974c (patch)
tree9486b07c91bec174aa431aa669f96fbe68f3a6d1 /arch/alpha
parent63540ba3691600759c6732f800dcf0fe8075960b (diff)
downloadop-kernel-dev-041a6baec5a9260ad8b71c43a7ea1de95dfa974c.zip
op-kernel-dev-041a6baec5a9260ad8b71c43a7ea1de95dfa974c.tar.gz
[PATCH] fallout from alpha pt_regs patches
missed irq handler in sys_titan and forgotten prototype update. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/kernel/proto.h2
-rw-r--r--arch/alpha/kernel/sys_titan.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h
index daccd4b..95912ec 100644
--- a/arch/alpha/kernel/proto.h
+++ b/arch/alpha/kernel/proto.h
@@ -36,7 +36,7 @@ extern void cia_pci_tbi(struct pci_controller *, dma_addr_t, dma_addr_t);
extern struct pci_ops irongate_pci_ops;
extern int irongate_pci_clr_err(void);
extern void irongate_init_arch(void);
-extern void irongate_machine_check(u64, u64, struct pt_regs *);
+extern void irongate_machine_check(u64, u64);
#define irongate_pci_tbi ((void *)0)
/* core_lca.c */
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 161d691..29ab7db 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -204,7 +204,7 @@ static struct hw_interrupt_type titan_irq_type = {
};
static irqreturn_t
-titan_intr_nop(int irq, void *dev_id, struct pt_regs *regs)
+titan_intr_nop(int irq, void *dev_id)
{
/*
* This is a NOP interrupt handler for the purposes of
OpenPOWER on IntegriCloud