m68k: merge MMU and non MMU versions of system.h

The non-MMU m68k targets can use the same asm/system.h as the MMU
targets. So switch the current system_mm.h to be system.h and remove
system_no.h.

The assembly support code for the non-MMU resume functions needs to
be modified to match the now common switch_to() macro. Specifically
this means correctly saving and restoring the status flags in the case
of the ColdFire resume, and some reordering of the code to not use
registers before they are saved or after they are restored.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

3 files changed, 25 insertions, 25 deletions

diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68328/entry.S
index f68dce766c0a..4ed7a65d5aa0 100644
--- a/arch/m68k/platform/68328/entry.S
+++ b/arch/m68k/platform/68328/entry.S
@@ -241,22 +241,21 @@ ENTRY(bad_interrupt)
 
 /*
  * Beware - when entering resume, prev (the current task) is
- * in a0, next (the new task) is in a1,so don't change these
+ * in a0, next (the new task) is in a1, so don't change these
  * registers until their contents are no longer needed.
  */
 ENTRY(resume)
         movel   %a0,%d1                         /* save prev thread in d1 */
         movew   %sr,%a0@(TASK_THREAD+THREAD_SR) /* save sr */
-        movel   %usp,%a2                        /* save usp */
-        movel   %a2,%a0@(TASK_THREAD+THREAD_USP)
-
         SAVE_SWITCH_STACK
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack */
+        movel   %usp,%a3                        /* save usp */
+        movel   %a3,%a0@(TASK_THREAD+THREAD_USP)
+
+        movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore user stack */
+        movel   %a3,%usp
         movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new thread stack */
         RESTORE_SWITCH_STACK
-
-        movel   %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore user stack */
-        movel   %a0,%usp
         movew   %a1@(TASK_THREAD+THREAD_SR),%sr /* restore thread status reg */
         rts
 
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S
index a07b14feed92..0ede6702127a 100644
--- a/arch/m68k/platform/68360/entry.S
+++ b/arch/m68k/platform/68360/entry.S
@@ -162,22 +162,21 @@ bad_interrupt:
 
 /*
  * Beware - when entering resume, prev (the current task) is
- * in a0, next (the new task) is in a1,so don't change these
+ * in a0, next (the new task) is in a1, so don't change these
  * registers until their contents are no longer needed.
  */
 ENTRY(resume)
         movel   %a0,%d1                         /* save prev thread in d1 */
         movew   %sr,%a0@(TASK_THREAD+THREAD_SR) /* save sr */
-        movel   %usp,%a2                        /* save usp */
-        movel   %a2,%a0@(TASK_THREAD+THREAD_USP)
-
         SAVE_SWITCH_STACK
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack */
+        movel   %usp,%a3                        /* save usp */
+        movel   %a3,%a0@(TASK_THREAD+THREAD_USP)
+
+        movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore user stack */
+        movel   %a3,%usp
         movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new thread stack */
         RESTORE_SWITCH_STACK
-
-        movel   %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore user stack */
-        movel   %a0,%usp
         movew   %a1@(TASK_THREAD+THREAD_SR),%sr /* restore thread status reg */
         rts
 
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index 27c2b001161e..bd27242c2f43 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -182,21 +182,23 @@ ENTRY(inthandler)
 
 /*
  * Beware - when entering resume, prev (the current task) is
- * in a0, next (the new task) is in a1,so don't change these
+ * 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 */
-        RDUSP
-        movel   %a2,%a0@(TASK_THREAD+THREAD_USP)
-
+        movew   %sr,%d1                          /* save current status */
+        movew   %d1,%a0@(TASK_THREAD+THREAD_SR)
+        movel   %a0,%d1                          /* get prev thread in d1 */
         SAVE_SWITCH_STACK
         movel   %sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack pointer */
-        movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new thread stack */
+        RDUSP                                    /* movel %usp,%a3 */
+        movel   %a3,%a0@(TASK_THREAD+THREAD_USP) /* save thread user stack */
+
+        movel   %a1@(TASK_THREAD+THREAD_USP),%a3 /* restore thread user stack */
+        WRUSP                                    /* movel %a3,%usp */
+        movel   %a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new kernel stack */
+        movew   %a1@(TASK_THREAD+THREAD_SR),%d7  /* restore new status */
+        movew   %d7,%sr
         RESTORE_SWITCH_STACK
-
-        movel   %a1@(TASK_THREAD+THREAD_USP),%a0 /* restore thread user stack */
-        WRUSP
         rts
+