aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-31 00:26:52 -0400
committerGreg Ungerer <gerg@uclinux.org>2011-12-24 06:47:57 -0500
commit46729d0eb301f689272c64a9417e7b40038f42a6 (patch)
tree11e6cd58605c6d6e6d1e7e969513300dfcb4eb56 /arch
parentd1db9120cd7df0872385fd29a25257f23cb70527 (diff)
m68knommu: no need to set register marker on traps
Commit 61619b12078dc8b85a3d4cbfa16f650daa341bd1 ("m68k: merge mmu and non-mmu include/asm/entry.h files") made the trap entry code basically the same for mmu and non-mmu builds. This means we no longer need code to mark the stack frame as "system-call" type or other in the non-mmu trap handling entry points. This is done in the SAVE_ALL_INT macro now. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/kernel/entry_no.S6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68k/kernel/entry_no.S b/arch/m68k/kernel/entry_no.S
index 1b4289061a6..ac86a9ffc1d 100644
--- a/arch/m68k/kernel/entry_no.S
+++ b/arch/m68k/kernel/entry_no.S
@@ -44,8 +44,6 @@
44 44
45ENTRY(buserr) 45ENTRY(buserr)
46 SAVE_ALL_INT 46 SAVE_ALL_INT
47 moveq #-1,%d0
48 movel %d0,%sp@(PT_OFF_ORIG_D0)
49 movel %sp,%sp@- /* stack frame pointer argument */ 47 movel %sp,%sp@- /* stack frame pointer argument */
50 jsr buserr_c 48 jsr buserr_c
51 addql #4,%sp 49 addql #4,%sp
@@ -53,8 +51,6 @@ ENTRY(buserr)
53 51
54ENTRY(trap) 52ENTRY(trap)
55 SAVE_ALL_INT 53 SAVE_ALL_INT
56 moveq #-1,%d0
57 movel %d0,%sp@(PT_OFF_ORIG_D0)
58 movel %sp,%sp@- /* stack frame pointer argument */ 54 movel %sp,%sp@- /* stack frame pointer argument */
59 jsr trap_c 55 jsr trap_c
60 addql #4,%sp 56 addql #4,%sp
@@ -65,8 +61,6 @@ ENTRY(trap)
65.globl dbginterrupt 61.globl dbginterrupt
66ENTRY(dbginterrupt) 62ENTRY(dbginterrupt)
67 SAVE_ALL_INT 63 SAVE_ALL_INT
68 moveq #-1,%d0
69 movel %d0,%sp@(PT_OFF_ORIG_D0)
70 movel %sp,%sp@- /* stack frame pointer argument */ 64 movel %sp,%sp@- /* stack frame pointer argument */
71 jsr dbginterrupt_c 65 jsr dbginterrupt_c
72 addql #4,%sp 66 addql #4,%sp