diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-07 09:16:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 13:51:14 -0400 |
commit | 2850bc273776cbb1b510c5828e9e456dffb50a32 (patch) | |
tree | 340bd599b6efde40618ef89de59cbe957269eac2 /include/asm-m68k/sun3xflop.h | |
parent | 00079e04fe478cd3c59ae2106ef2fbe779e67024 (diff) |
[PATCH] m68k pt_regs fixes
m68k_handle_int() split in two functions: __m68k_handle_int() takes
pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs
*.
Places where we used to call m68k_handle_int() recursively with the same
pt_regs have simply lost the second argument, the rest is switched to
__m68k_handle_int().
The rest of patch is just dropping pt_regs * where needed.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k/sun3xflop.h')
-rw-r--r-- | include/asm-m68k/sun3xflop.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-m68k/sun3xflop.h b/include/asm-m68k/sun3xflop.h index ca8cc4113843..32c45f84ac60 100644 --- a/include/asm-m68k/sun3xflop.h +++ b/include/asm-m68k/sun3xflop.h | |||
@@ -111,8 +111,7 @@ static void sun3x_82072_fd_outb(unsigned char value, int port) | |||
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
114 | asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id, | 114 | asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id) |
115 | struct pt_regs * regs) | ||
116 | { | 115 | { |
117 | register unsigned char st; | 116 | register unsigned char st; |
118 | 117 | ||
@@ -125,7 +124,7 @@ asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id, | |||
125 | static int dma_wait=0; | 124 | static int dma_wait=0; |
126 | #endif | 125 | #endif |
127 | if(!doing_pdma) { | 126 | if(!doing_pdma) { |
128 | floppy_interrupt(irq, dev_id, regs); | 127 | floppy_interrupt(irq, dev_id); |
129 | return IRQ_HANDLED; | 128 | return IRQ_HANDLED; |
130 | } | 129 | } |
131 | 130 | ||
@@ -189,7 +188,7 @@ asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id, | |||
189 | dma_wait=0; | 188 | dma_wait=0; |
190 | #endif | 189 | #endif |
191 | 190 | ||
192 | floppy_interrupt(irq, dev_id, regs); | 191 | floppy_interrupt(irq, dev_id); |
193 | return IRQ_HANDLED; | 192 | return IRQ_HANDLED; |
194 | } | 193 | } |
195 | 194 | ||