diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:42:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:42:40 -0500 |
| commit | 85a07029aaba8f5b27241bcff56cc009c9f4993b (patch) | |
| tree | c579554c2ea9c942ccbea60e223bc62d8262f652 /arch/m68k/ifpsp060/iskeleton.S | |
| parent | 0da36b3467040908d3df6bc1f5b4d592a8b23b63 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/m68k/ifpsp060/iskeleton.S')
| -rw-r--r-- | arch/m68k/ifpsp060/iskeleton.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/ifpsp060/iskeleton.S b/arch/m68k/ifpsp060/iskeleton.S index 4ba2c74da93..b2dbdf5ee30 100644 --- a/arch/m68k/ifpsp060/iskeleton.S +++ b/arch/m68k/ifpsp060/iskeleton.S @@ -75,10 +75,8 @@ _060_isp_done: .Lnotkern: SAVE_ALL_INT GET_CURRENT(%d0) - tstb %curptr@(TASK_NEEDRESCHED) - jne ret_from_exception | deliver signals, - | reschedule etc.. - RESTORE_ALL + | deliver signals, reschedule etc.. + jra ret_from_exception | | _060_real_chk(): |