aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 08:47:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:00:58 -0400
commit77dda339e512c729bb27abd452e6632465490986 (patch)
tree6c3bdba69fbf9b27ebf2dfe4e52a78d14d649390 /arch/m68k/kernel
parent9c5f4afdfbe72d5d1c814ad7286a4524d00c7b96 (diff)
[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.S11
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)
205 205
206 movel %sp,%sp@- 206 movel %sp,%sp@-
207 movel %d0,%sp@- | put vector # on stack 207 movel %d0,%sp@- | put vector # on stack
208#if defined(MACH_Q40_ONLY) && defined(CONFIG_BLK_DEV_FD)
209 btstb #4,0xff000000 | Q40 floppy needs very special treatment ...
210 jbeq 1f
211 btstb #3,0xff000004
212 jbeq 1f
213 jbsr floppy_hardint
214 jbra 3f
2151:
216#endif
217auto_irqhandler_fixup = . + 2 208auto_irqhandler_fixup = . + 2
218 jsr m68k_handle_int | process the IRQ 209 jsr m68k_handle_int | process the IRQ
2193: addql #8,%sp | pop parameters off stack 210 addql #8,%sp | pop parameters off stack
220 211
221ret_from_interrupt: 212ret_from_interrupt:
222 subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) 213 subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)