Merge commit 'upstream/master'

1 files changed, 1 insertions, 2 deletions

diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index a9e6bad9f706..0d407e886735 100644
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -65,7 +65,7 @@ lookup_exec_domain(u_long personality)
                                 goto out;
         }
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
         read_unlock(&exec_domains_lock);
         request_module("personality-%ld", pers);
         read_lock(&exec_domains_lock);
@@ -168,7 +168,6 @@ __set_personality(u_long personality)
         current->personality = personality;
         oep = current_thread_info()->exec_domain;
         current_thread_info()->exec_domain = ep;
-        set_fs_altroot();
 
         module_put(oep->module);
         return 0;