This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / sparc / kernel / sys_sparc.c

diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index 0787907..86950ea 100644 (file)
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -21,7 +21,6 @@
 #include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
@@ -333,7 +332,7 @@ asmlinkage unsigned long sparc_mremap(unsigned long addr,
 
                new_addr = get_unmapped_area(file, addr, new_len,
                                     vma ? vma->vm_pgoff : 0,
-                                    map_flags);
+                                    map_flags, vma->vm_flags & VM_EXEC);
                ret = new_addr;
                if (new_addr & ~PAGE_MASK)
                        goto out_sem;