From ed55576189fcc3ced1a6b47c87975f50a5a64ff4 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 31 Aug 2009 14:43:34 +0200
Subject: [PATCH] --- yaml --- r: 158136 b: refs/heads/master c:
 96910b6dc8a4fdb75e69f09f47b62d41743d36ba h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/m68k/include/asm/entry_mm.h | 1 -
 trunk/arch/m68k/kernel/asm-offsets.c   | 8 ++++----
 trunk/arch/m68k/math-emu/fp_entry.S    | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8d59c89b58ac..177e22c34030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b62e180cae6bd82e246d871a1e44e03f8019d421
+refs/heads/master: 96910b6dc8a4fdb75e69f09f47b62d41743d36ba
diff --git a/trunk/arch/m68k/include/asm/entry_mm.h b/trunk/arch/m68k/include/asm/entry_mm.h
index 4fcfc28c0610..474125886218 100644
--- a/trunk/arch/m68k/include/asm/entry_mm.h
+++ b/trunk/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/trunk/arch/m68k/kernel/asm-offsets.c b/trunk/arch/m68k/kernel/asm-offsets.c
index 25d6b721522e..73e5e581245b 100644
--- a/trunk/arch/m68k/kernel/asm-offsets.c
+++ b/trunk/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/trunk/arch/m68k/math-emu/fp_entry.S b/trunk/arch/m68k/math-emu/fp_entry.S
index 916c6f3d1f07..a3fe1f348dfe 100644
--- a/trunk/arch/m68k/math-emu/fp_entry.S
+++ b/trunk/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