3 files changed, 2 insertions, 6 deletions

diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index f111b02b704f..d8ef53ac03f9 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/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/arch/m68k/kernel/process_mm.c b/arch/m68k/kernel/process_mm.c
index c2a1fc23dd75..1bc223aa07ec 100644
--- a/arch/m68k/kernel/process_mm.c
+++ b/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/arch/m68k/kernel/process_no.c b/arch/m68k/kernel/process_no.c
index 9b86ad11c68e..69c1803fcf1b 100644
--- a/arch/m68k/kernel/process_no.c
+++ b/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)