diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 09:36:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:32:35 -0400 |
| commit | 7ca56053b29633ef08b14e5ca16c663363edac36 (patch) | |
| tree | f8940145602aca5ea9ff35c9c8b5dc508e23d611 /arch/alpha/kernel/sys_takara.c | |
| parent | 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 (diff) | |
[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_takara.c')
| -rw-r--r-- | arch/alpha/kernel/sys_takara.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c index 2c75cd1fd81a..ce2d3b081dc8 100644 --- a/arch/alpha/kernel/sys_takara.c +++ b/arch/alpha/kernel/sys_takara.c | |||
| @@ -85,7 +85,7 @@ static struct hw_interrupt_type takara_irq_type = { | |||
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | static void | 87 | static void |
| 88 | takara_device_interrupt(unsigned long vector, struct pt_regs *regs) | 88 | takara_device_interrupt(unsigned long vector) |
| 89 | { | 89 | { |
| 90 | unsigned intstatus; | 90 | unsigned intstatus; |
| 91 | 91 | ||
| @@ -112,20 +112,20 @@ takara_device_interrupt(unsigned long vector, struct pt_regs *regs) | |||
| 112 | * despatch an interrupt if it's set. | 112 | * despatch an interrupt if it's set. |
| 113 | */ | 113 | */ |
| 114 | 114 | ||
| 115 | if (intstatus & 8) handle_irq(16+3, regs); | 115 | if (intstatus & 8) handle_irq(16+3, get_irq_regs()); |
| 116 | if (intstatus & 4) handle_irq(16+2, regs); | 116 | if (intstatus & 4) handle_irq(16+2, get_irq_regs()); |
| 117 | if (intstatus & 2) handle_irq(16+1, regs); | 117 | if (intstatus & 2) handle_irq(16+1, get_irq_regs()); |
| 118 | if (intstatus & 1) handle_irq(16+0, regs); | 118 | if (intstatus & 1) handle_irq(16+0, get_irq_regs()); |
| 119 | } else { | 119 | } else { |
| 120 | isa_device_interrupt (vector, regs); | 120 | isa_device_interrupt (vector); |
| 121 | } | 121 | } |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | static void | 124 | static void |
| 125 | takara_srm_device_interrupt(unsigned long vector, struct pt_regs * regs) | 125 | takara_srm_device_interrupt(unsigned long vector) |
| 126 | { | 126 | { |
| 127 | int irq = (vector - 0x800) >> 4; | 127 | int irq = (vector - 0x800) >> 4; |
| 128 | handle_irq(irq, regs); | 128 | handle_irq(irq, get_irq_regs()); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | static void __init | 131 | static void __init |
