bonding: select current active slave when enslaving device for mode tlb and alb

[karo-tx-linux.git] / kernel / exec_domain.c

diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index a9e6bad9f706b05f96b2e7c4e16e6cb75acd6f4e..18e8a50908bbadc73829d524b296435a662bb974 100644 (file)
--- 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;
@@ -189,8 +188,7 @@ get_exec_domain_list(char *page)
        return (len);
 }
 
-asmlinkage long
-sys_personality(u_long personality)
+SYSCALL_DEFINE1(personality, u_long, personality)
 {
        u_long old = current->personality;