3 files changed, 8 insertions, 9 deletions

diff --git a/arch/m68k/include/asm/entry_mm.h b/arch/m68k/include/asm/entry_mm.h
index 4fcfc28c0610..474125886218 100644
--- a/arch/m68k/include/asm/entry_mm.h
+++ b/arch/m68k/include/asm/entry_mm.h
@@ -46,7 +46,6 @@
 #define curptr a2
 
 LFLUSH_I_AND_D = 0x00000808
-LSIGTRAP = 5
 
 /* process bits for task_struct.ptrace */
 PT_TRACESYS_OFF = 3
diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c
index 25d6b721522e..73e5e581245b 100644
--- a/arch/m68k/kernel/asm-offsets.c
+++ b/arch/m68k/kernel/asm-offsets.c
@@ -89,10 +89,10 @@ int main(void)
         DEFINE(FONT_DESC_PREF, offsetof(struct font_desc, pref));
 
         /* signal defines */
-        DEFINE(SIGSEGV, SIGSEGV);
-        DEFINE(SEGV_MAPERR, SEGV_MAPERR);
-        DEFINE(SIGTRAP, SIGTRAP);
-        DEFINE(TRAP_TRACE, TRAP_TRACE);
+        DEFINE(LSIGSEGV, SIGSEGV);
+        DEFINE(LSEGV_MAPERR, SEGV_MAPERR);
+        DEFINE(LSIGTRAP, SIGTRAP);
+        DEFINE(LTRAP_TRACE, TRAP_TRACE);
 
         /* offsets into the custom struct */
         DEFINE(CUSTOMBASE, &amiga_custom);
diff --git a/arch/m68k/math-emu/fp_entry.S b/arch/m68k/math-emu/fp_entry.S
index 916c6f3d1f07..a3fe1f348dfe 100644
--- a/arch/m68k/math-emu/fp_entry.S
+++ b/arch/m68k/math-emu/fp_entry.S
@@ -85,8 +85,8 @@ fp_err_ua2:
 fp_err_ua1:
         addq.l  #4,%sp
         move.l  %a0,-(%sp)
-        pea     SEGV_MAPERR
-        pea     SIGSEGV
+        pea     LSEGV_MAPERR
+        pea     LSIGSEGV
         jsr     fpemu_signal
         add.w   #12,%sp
         jra     ret_from_exception
@@ -96,8 +96,8 @@ fp_err_ua1:
         | it does not really belong here, but...
 fp_sendtrace060:
         move.l  (FPS_PC,%sp),-(%sp)
-        pea     TRAP_TRACE
-        pea     SIGTRAP
+        pea     LTRAP_TRACE
+        pea     LSIGTRAP
         jsr     fpemu_signal
         add.w   #12,%sp
         jra     ret_from_exception