From 63a72844a5d51e64d2a867718be88dfc2baa3b92 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Mon, 25 Jul 2011 17:12:42 -0700
Subject: [PATCH] --- yaml --- r: 258975 b: refs/heads/master c:
 b7de110044b4e26adcb7b278d14da93133692ed7 h: refs/heads/master i:   258973:
 92c4f63fa3a44961f8ead90e440a55eaa6f2c90c   258971:
 e13af73e8fdc757798930dab3c2c1331d15a8a1e   258967:
 0d44296544851db6147fc40cda4d29ef4303d800   258959:
 0f14f8d292596b0fed099aa4916a37507af02396   258943:
 d7d5e59dbf2b9104d832349b72d8386bf96ac7ec v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/m68k/include/asm/processor.h | 4 ----
 trunk/arch/m68k/kernel/process_mm.c     | 2 +-
 trunk/arch/m68k/kernel/process_no.c     | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index cd97cc7db65b..ed01c9bc23e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f796062598235b9f73086d0fb779e120ae9581a0
+refs/heads/master: b7de110044b4e26adcb7b278d14da93133692ed7
diff --git a/trunk/arch/m68k/include/asm/processor.h b/trunk/arch/m68k/include/asm/processor.h
index f111b02b704f..d8ef53ac03f9 100644
--- a/trunk/arch/m68k/include/asm/processor.h
+++ b/trunk/arch/m68k/include/asm/processor.h
@@ -105,9 +105,6 @@ struct thread_struct {
 static inline void start_thread(struct pt_regs * regs, unsigned long pc,
 				unsigned long usp)
 {
-	/* reads from user space */
-	set_fs(USER_DS);
-
 	regs->pc = pc;
 	regs->sr &= ~0x2000;
 	wrusp(usp);
@@ -129,7 +126,6 @@ extern int handle_kernel_fault(struct pt_regs *regs);
 
 #define start_thread(_regs, _pc, _usp)                  \
 do {                                                    \
-	set_fs(USER_DS); /* reads from user space */    \
 	(_regs)->pc = (_pc);                            \
 	((struct switch_stack *)(_regs))[-1].a6 = 0;    \
 	reformat(_regs);                                \
diff --git a/trunk/arch/m68k/kernel/process_mm.c b/trunk/arch/m68k/kernel/process_mm.c
index c2a1fc23dd75..1bc223aa07ec 100644
--- a/trunk/arch/m68k/kernel/process_mm.c
+++ b/trunk/arch/m68k/kernel/process_mm.c
@@ -185,7 +185,7 @@ EXPORT_SYMBOL(kernel_thread);
 void flush_thread(void)
 {
 	unsigned long zero = 0;
-	set_fs(USER_DS);
+
 	current->thread.fs = __USER_DS;
 	if (!FPU_IS_EMU)
 		asm volatile (".chip 68k/68881\n\t"
diff --git a/trunk/arch/m68k/kernel/process_no.c b/trunk/arch/m68k/kernel/process_no.c
index 9b86ad11c68e..69c1803fcf1b 100644
--- a/trunk/arch/m68k/kernel/process_no.c
+++ b/trunk/arch/m68k/kernel/process_no.c
@@ -158,7 +158,7 @@ void flush_thread(void)
 #ifdef CONFIG_FPU
 	unsigned long zero = 0;
 #endif
-	set_fs(USER_DS);
+
 	current->thread.fs = __USER_DS;
 #ifdef CONFIG_FPU
 	if (!FPU_IS_EMU)