This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index 90580ec..6715972 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -47,8 +47,6 @@
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
 #include <linux/ckrm.h>
-#include <linux/vs_memory.h>
-#include <linux/ckrm_mem.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -558,19 +556,6 @@ static int exec_mmap(struct mm_struct *mm)
        tsk->active_mm = mm;
        activate_mm(active_mm, mm);
        task_unlock(tsk);
-       arch_pick_mmap_layout(mm);
-#ifdef CONFIG_CKRM_RES_MEM
-       if (old_mm) {
-               spin_lock(&old_mm->peertask_lock);
-               list_del(&tsk->mm_peers);
-               ckrm_mem_evaluate_mm(old_mm);
-               spin_unlock(&old_mm->peertask_lock);
-       }
-       spin_lock(&mm->peertask_lock);
-       list_add_tail(&tsk->mm_peers, &mm->tasklist);
-       ckrm_mem_evaluate_mm(mm);
-       spin_unlock(&mm->peertask_lock);
-#endif
        if (old_mm) {
                if (active_mm != old_mm) BUG();
                mmput(old_mm);
@@ -914,8 +899,11 @@ int prepare_binprm(struct linux_binprm *bprm)
        if(!(bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID)) {
                /* Set-uid? */
                if (mode & S_ISUID) {
-                       current->personality &= ~PER_CLEAR_ON_SETID;
                        bprm->e_uid = inode->i_uid;
+#ifdef __i386__
+                       /* reset personality */
+                       current->personality = PER_LINUX;
+#endif
                }
 
                /* Set-gid? */
@@ -925,8 +913,11 @@ int prepare_binprm(struct linux_binprm *bprm)
                 * executable.
                 */
                if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
-                       current->personality &= ~PER_CLEAR_ON_SETID;
                        bprm->e_gid = inode->i_gid;
+#ifdef __i386__
+                       /* reset personality */
+                       current->personality = PER_LINUX;
+#endif
                }
        }