git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
[pandora-kernel.git]
/
arch
/
m68k
/
kernel
/
entry_mm.S
diff --git
a/arch/m68k/kernel/entry_mm.S
b/arch/m68k/kernel/entry_mm.S
index
bd0ec05
..
c713f51
100644
(file)
--- a/
arch/m68k/kernel/entry_mm.S
+++ b/
arch/m68k/kernel/entry_mm.S
@@
-48,7
+48,7
@@
.globl sys_fork, sys_clone, sys_vfork
.globl ret_from_interrupt, bad_interrupt
.globl auto_irqhandler_fixup
.globl sys_fork, sys_clone, sys_vfork
.globl ret_from_interrupt, bad_interrupt
.globl auto_irqhandler_fixup
-.globl user_irqvec_fixup
, user_irqhandler_fixup
+.globl user_irqvec_fixup
.text
ENTRY(buserr)
.text
ENTRY(buserr)
@@
-207,7
+207,7
@@
ENTRY(auto_inthandler)
movel %sp,%sp@-
movel %d0,%sp@- | put vector # on stack
auto_irqhandler_fixup = . + 2
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:
addql #8,%sp | pop parameters off stack
ret_from_interrupt:
@@
-240,8
+240,7
@@
user_irqvec_fixup = . + 2
movel %sp,%sp@-
movel %d0,%sp@- | put vector # on stack
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)
addql #8,%sp | pop parameters off stack
subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)