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/floppy.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/floppy.h')
-rw-r--r-- | include/asm-m68k/floppy.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asm-m68k/floppy.h b/include/asm-m68k/floppy.h index 57f4fdda65ab..45dc908932a3 100644 --- a/include/asm-m68k/floppy.h +++ b/include/asm-m68k/floppy.h | |||
@@ -17,8 +17,7 @@ | |||
17 | 17 | ||
18 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
19 | 19 | ||
20 | asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, | 20 | asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id); |
21 | struct pt_regs *regs); | ||
22 | 21 | ||
23 | /* constants... */ | 22 | /* constants... */ |
24 | 23 | ||
@@ -184,8 +183,7 @@ static void fd_disable_dma(void) | |||
184 | 183 | ||
185 | /* this is the only truly Q40 specific function */ | 184 | /* this is the only truly Q40 specific function */ |
186 | 185 | ||
187 | asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, | 186 | asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id) |
188 | struct pt_regs *regs) | ||
189 | { | 187 | { |
190 | register unsigned char st; | 188 | register unsigned char st; |
191 | 189 | ||
@@ -198,7 +196,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, | |||
198 | static int dma_wait=0; | 196 | static int dma_wait=0; |
199 | #endif | 197 | #endif |
200 | if(!doing_pdma) { | 198 | if(!doing_pdma) { |
201 | floppy_interrupt(irq, dev_id, regs); | 199 | floppy_interrupt(irq, dev_id); |
202 | return IRQ_HANDLED; | 200 | return IRQ_HANDLED; |
203 | } | 201 | } |
204 | 202 | ||
@@ -246,7 +244,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, | |||
246 | dma_wait=0; | 244 | dma_wait=0; |
247 | #endif | 245 | #endif |
248 | doing_pdma = 0; | 246 | doing_pdma = 0; |
249 | floppy_interrupt(irq, dev_id, regs); | 247 | floppy_interrupt(irq, dev_id); |
250 | return IRQ_HANDLED; | 248 | return IRQ_HANDLED; |
251 | } | 249 | } |
252 | #ifdef TRACE_FLPY_INT | 250 | #ifdef TRACE_FLPY_INT |