diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 14:36:08 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 12:32:35 -0700 |
| commit | 7ca56053b29633ef08b14e5ca16c663363edac36 (patch) | |
| tree | f8940145602aca5ea9ff35c9c8b5dc508e23d611 /arch/alpha/kernel/sys_marvel.c | |
| parent | 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 (diff) | |
| download | blackbird-op-linux-7ca56053b29633ef08b14e5ca16c663363edac36.tar.gz blackbird-op-linux-7ca56053b29633ef08b14e5ca16c663363edac36.zip | |
[PATCH] alpha pt_regs cleanups: device_interrupt
callers of ->device_interrupt() do set_irq_regs() now; pt_regs argument
removed, remaining uses of regs in instances of ->device_interrupt()
are switched to get_irq_regs() and will be gone in the next patch.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha/kernel/sys_marvel.c')
| -rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 36d215954376..4ea5615be43a 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c @@ -38,7 +38,7 @@ * Interrupt handling. */ static void -io7_device_interrupt(unsigned long vector, struct pt_regs * regs) +io7_device_interrupt(unsigned long vector) { unsigned int pid; unsigned int irq; @@ -64,7 +64,7 @@ io7_device_interrupt(unsigned long vector, struct pt_regs * regs) irq &= MARVEL_IRQ_VEC_IRQ_MASK; /* not too many bits */ irq |= pid << MARVEL_IRQ_VEC_PE_SHIFT; /* merge the pid */ - handle_irq(irq, regs); + handle_irq(irq, get_irq_regs()); } static volatile unsigned long * |
