Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / arch / m68k / kernel / process_no.c

diff --git a/arch/m68k/kernel/process_no.c b/arch/m68k/kernel/process_no.c
index 9b86ad1..69c1803 100644 (file)
--- 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)