summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/entry_mm.S
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-07-01 20:39:19 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 22:35:48 +0100
commit1425df87c25b15400c9f26d57821bcfe01286b2a (patch)
tree845f69013de5ebb1b9ebfe4746c096664a505567 /arch/m68k/kernel/entry_mm.S
parentm68k/irq: Add m68k_setup_irq_controller() (diff)
downloadlinux-1425df87c25b15400c9f26d57821bcfe01286b2a.tar.xz
linux-1425df87c25b15400c9f26d57821bcfe01286b2a.zip
m68k/irq: Rename {,__}m68k_handle_int()
- Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded asmlinkage, - Rename __m68k_handle_int() to do_IRQ(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel/entry_mm.S')
-rw-r--r--arch/m68k/kernel/entry_mm.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S
index bd0ec05263b2..f5927d0927b4 100644
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@ -207,7 +207,7 @@ ENTRY(auto_inthandler)
movel %sp,%sp@-
movel %d0,%sp@- | put vector # on stack
auto_irqhandler_fixup = . + 2
- jsr __m68k_handle_int | process the IRQ
+ jsr do_IRQ | process the IRQ
addql #8,%sp | pop parameters off stack
ret_from_interrupt:
@@ -241,7 +241,7 @@ user_irqvec_fixup = . + 2
movel %sp,%sp@-
movel %d0,%sp@- | put vector # on stack
user_irqhandler_fixup = . + 2
- jsr __m68k_handle_int | process the IRQ
+ jsr do_IRQ | process the IRQ
addql #8,%sp | pop parameters off stack
subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)