Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 041a6bae authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] fallout from alpha pt_regs patches 



missed irq handler in sys_titan and forgotten prototype update.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 63540ba3

arch/alpha/kernel/proto.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/alpha/kernel/sys_titan.c

+1 −1
Original line number Diff line number Diff line
@@ -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