From eec0f1d641feaa701e682f6620e35ee6f3a762a4 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Thu, 9 Jun 2011 20:05:18 +0200
Subject: [PATCH] --- yaml --- r: 253319 b: refs/heads/master c:
 dac853ae89043f1b7752875300faf614de43c74b h: refs/heads/master i:   253317:
 4320b339d37b54aebb19d8534c61ba872130d01f   253315:
 c55fa3716ea3da96f7e613210fccb8073da60f05   253311:
 c3c9423cb8242636da7feed00d8935c78e54a9af v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/process_32.c | 1 -
 trunk/arch/x86/kernel/process_64.c | 1 -
 trunk/fs/exec.c                    | 5 +----
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f6ef69c282a8..95dcca1f62d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06e86849cf4019945a106913adb9ff0abcc01770
+refs/heads/master: dac853ae89043f1b7752875300faf614de43c74b
diff --git a/trunk/arch/x86/kernel/process_32.c b/trunk/arch/x86/kernel/process_32.c
index 8d128783af47..a3d0dc59067b 100644
--- a/trunk/arch/x86/kernel/process_32.c
+++ b/trunk/arch/x86/kernel/process_32.c
@@ -245,7 +245,6 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
 {
 	set_user_gs(regs, 0);
 	regs->fs		= 0;
-	set_fs(USER_DS);
 	regs->ds		= __USER_DS;
 	regs->es		= __USER_DS;
 	regs->ss		= __USER_DS;
diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c
index 6c9dd922ac0d..ca6f7ab8df33 100644
--- a/trunk/arch/x86/kernel/process_64.c
+++ b/trunk/arch/x86/kernel/process_64.c
@@ -338,7 +338,6 @@ start_thread_common(struct pt_regs *regs, unsigned long new_ip,
 	regs->cs		= _cs;
 	regs->ss		= _ss;
 	regs->flags		= X86_EFLAGS_IF;
-	set_fs(USER_DS);
 	/*
 	 * Free the old FP and other extended state
 	 */
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index ea5f748906a8..97e0d52d72fd 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1093,6 +1093,7 @@ int flush_old_exec(struct linux_binprm * bprm)
 
 	bprm->mm = NULL;		/* We're using it now */
 
+	set_fs(USER_DS);
 	current->flags &= ~(PF_RANDOMIZE | PF_KTHREAD);
 	flush_thread();
 	current->personality &= ~bprm->per_clear;
@@ -1357,10 +1358,6 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
 	if (retval)
 		return retval;
 
-	/* kernel module loader fixup */
-	/* so we don't try to load run modprobe in kernel space. */
-	set_fs(USER_DS);
-
 	retval = audit_bprm(bprm);
 	if (retval)
 		return retval;