X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fexec.c;h=671597205cf649bf0d12caaafbbea1651702b7b6;hb=ed54dc1279543caf10ba95fb0a1e9fa47ab6c4b4;hp=afe3dbb9c8bf4eca56d7b9ddc0afb2d8ed731b39;hpb=c7176e679977ecaafff74461614cf77522a373cd;p=linux-2.6.git

diff --git a/fs/exec.c b/fs/exec.c
index afe3dbb9c..671597205 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -47,7 +47,6 @@
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
 #include <linux/ckrm.h>
-#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -439,6 +438,7 @@ int setup_arg_pages(struct linux_binprm *bprm, int executable_stack)
 			mpnt->vm_flags = VM_STACK_FLAGS & ~VM_EXEC;
 		else
 			mpnt->vm_flags = VM_STACK_FLAGS;
+		mpnt->vm_flags |= mm->def_flags;
 		mpnt->vm_page_prot = protection_map[mpnt->vm_flags & 0x7];
 		insert_vm_struct(mm, mpnt);
 		// mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
@@ -1112,6 +1112,7 @@ int do_execve(char * filename,
 	bprm.filename = filename;
 	bprm.interp = filename;
 	bprm.interp_flags = 0;
+	bprm.interp_data = 0;
 	bprm.sh_bang = 0;
 	bprm.loader = 0;
 	bprm.exec = 0;