diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-25 05:47:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:00:58 -0700 |
| commit | 77dda339e512c729bb27abd452e6632465490986 (patch) | |
| tree | 6c3bdba69fbf9b27ebf2dfe4e52a78d14d649390 /arch/m68k/kernel | |
| parent | 9c5f4afdfbe72d5d1c814ad7286a4524d00c7b96 (diff) | |
| download | blackbird-op-linux-77dda339e512c729bb27abd452e6632465490986.tar.gz blackbird-op-linux-77dda339e512c729bb27abd452e6632465490986.zip | |
[PATCH] m68k: convert q40 irq code
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 48cccc556e13..449b62b30f45 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -205,18 +205,9 @@ ENTRY(auto_inthandler) movel %sp,%sp@- movel %d0,%sp@- | put vector # on stack -#if defined(MACH_Q40_ONLY) && defined(CONFIG_BLK_DEV_FD) - btstb #4,0xff000000 | Q40 floppy needs very special treatment ... - jbeq 1f - btstb #3,0xff000004 - jbeq 1f - jbsr floppy_hardint - jbra 3f -1: -#endif auto_irqhandler_fixup = . + 2 jsr m68k_handle_int | process the IRQ -3: addql #8,%sp | pop parameters off stack + addql #8,%sp | pop parameters off stack ret_from_interrupt: subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) |
