diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-07 14:16:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 10:51:14 -0700 |
| commit | 2850bc273776cbb1b510c5828e9e456dffb50a32 (patch) | |
| tree | 340bd599b6efde40618ef89de59cbe957269eac2 /include/asm-m68k/floppy.h | |
| parent | 00079e04fe478cd3c59ae2106ef2fbe779e67024 (diff) | |
| download | op-kernel-dev-2850bc273776cbb1b510c5828e9e456dffb50a32.zip op-kernel-dev-2850bc273776cbb1b510c5828e9e456dffb50a32.tar.gz | |
[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 57f4fdd..45dc908 100644 --- a/include/asm-m68k/floppy.h +++ b/include/asm-m68k/floppy.h @@ -17,8 +17,7 @@ #include <linux/vmalloc.h> -asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, - struct pt_regs *regs); +asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id); /* constants... */ @@ -184,8 +183,7 @@ static void fd_disable_dma(void) /* this is the only truly Q40 specific function */ -asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, - struct pt_regs *regs) +asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id) { register unsigned char st; @@ -198,7 +196,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, static int dma_wait=0; #endif if(!doing_pdma) { - floppy_interrupt(irq, dev_id, regs); + floppy_interrupt(irq, dev_id); return IRQ_HANDLED; } @@ -246,7 +244,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, dma_wait=0; #endif doing_pdma = 0; - floppy_interrupt(irq, dev_id, regs); + floppy_interrupt(irq, dev_id); return IRQ_HANDLED; } #ifdef TRACE_FLPY_INT |
