Skip to content

Commit

Permalink
m68knommu: simplify ColdFire resume code
Browse files Browse the repository at this point in the history
It is useless to preserve THREAD_SR in `resume'.  The real user's sr
is actually in the stack.  We also don't need to disable interrupts :
we'll never be in an invalid state, the sp switch is atomic.

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Jul 25, 2007
1 parent 063586a commit 7160a67
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions arch/m68knommu/platform/5307/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,12 @@ ENTRY(ret_from_interrupt)
* Beware - when entering resume, prev (the current task) is
* in a0, next (the new task) is in a1,so don't change these
* registers until their contents are no longer needed.
* This is always called in supervisor mode, so don't bother to save
* and restore sr; user's process sr is actually in the stack.
*/
ENTRY(resume)
movel %a0, %d1 /* get prev thread in d1 */

movew %sr,%d0 /* save thread status reg */
movew %d0,%a0@(TASK_THREAD+THREAD_SR)

oril #0x700,%d0 /* disable interrupts */
move %d0,%sr

movel sw_usp,%d0 /* save usp */
movel %d0,%a0@(TASK_THREAD+THREAD_USP)

Expand All @@ -233,7 +229,4 @@ ENTRY(resume)

movel %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore thread user stack */
movel %a0, sw_usp

movew %a1@(TASK_THREAD+THREAD_SR),%d0 /* restore thread status reg */
movew %d0, %sr
rts

0 comments on commit 7160a67

Please sign in to comment.