m68k: merge mmu and non-mmu include/asm/entry.h files

The changes in the mmu version of entry.h (entry_mm.h) and the non-mmu
version (entry_no.h) are not about the presence or use of an MMU at all.
The main changes are to support the ColdFire processors. The code for
trap entry and exit for all types of 68k processor outside coldfire is
the same.

So merge the files back to a single entry.h and share the common 68k
entry/exit code. Some changes are required for the non-mmu entry
handlers to adopt the differing macros for system call and interrupt
entry, but this is quite strait forward. The changes for the ColdFire
remove a couple of instructions for the separate a7 register case, and
are no worse for the older single a7 register case.

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

3 files changed, 13 insertions, 15 deletions

diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68328/entry.S
index 293e1eba9acc..5c39b80ed7de 100644
--- a/arch/m68k/platform/68328/entry.S
+++ b/arch/m68k/platform/68328/entry.S
@@ -67,7 +67,7 @@ ret_from_signal:
         jra     ret_from_exception
 
 ENTRY(system_call)
-        SAVE_ALL
+        SAVE_ALL_SYS
 
         /* save top of frame*/
         pea     %sp@
@@ -129,7 +129,7 @@ Lsignal_return:
  * This is the main interrupt handler, responsible for calling process_int()
  */
 inthandler1:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -140,7 +140,7 @@ inthandler1:
         bra     ret_from_interrupt
 
 inthandler2:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -151,7 +151,7 @@ inthandler2:
         bra     ret_from_interrupt
 
 inthandler3:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -162,7 +162,7 @@ inthandler3:
         bra     ret_from_interrupt
 
 inthandler4:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -173,7 +173,7 @@ inthandler4:
         bra     ret_from_interrupt
 
 inthandler5:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -184,7 +184,7 @@ inthandler5:
         bra     ret_from_interrupt
 
 inthandler6:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -195,7 +195,7 @@ inthandler6:
         bra     ret_from_interrupt
 
 inthandler7:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
@@ -206,7 +206,7 @@ inthandler7:
         bra     ret_from_interrupt
 
 inthandler:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and     #0x3ff, %d0
 
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S
index abbb89672ea0..aa47d1d49929 100644
--- a/arch/m68k/platform/68360/entry.S
+++ b/arch/m68k/platform/68360/entry.S
@@ -63,7 +63,7 @@ ret_from_signal:
         jra     ret_from_exception
 
 ENTRY(system_call)
-        SAVE_ALL
+        SAVE_ALL_SYS
 
         /* save top of frame*/
         pea     %sp@
@@ -125,7 +125,7 @@ Lsignal_return:
  * This is the main interrupt handler, responsible for calling do_IRQ()
  */
 inthandler:
-        SAVE_ALL
+        SAVE_ALL_INT
         movew   %sp@(PT_OFF_FORMATVEC), %d0
         and.l   #0x3ff, %d0
         lsr.l   #0x02,  %d0
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index bd27242c2f43..3157461a8d1d 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -61,7 +61,7 @@ enosys:
         bra     1f
 
 ENTRY(system_call)
-        SAVE_ALL
+        SAVE_ALL_SYS
         move    #0x2000,%sr             /* enable intrs again */
 
         cmpl    #NR_syscalls,%d0
@@ -165,9 +165,7 @@ Lsignal_return:
  * sources). Calls up to high level code to do all the work.
  */
 ENTRY(inthandler)
-        SAVE_ALL
-        moveq   #-1,%d0
-        movel   %d0,%sp@(PT_OFF_ORIG_D0)
+        SAVE_ALL_INT
 
         movew   %sp@(PT_OFF_FORMATVEC),%d0 /* put exception # in d0 */
         andl    #0x03fc,%d0             /* mask out vector only */