---

yaml --- r: 310551 b: refs/heads/master c: 736f24d h: refs/heads/master i: 310549: 45ae0f5 310547: 1a69a8a 310543: f102a50 v: v3
git-mirror · Jun 7, 2012 · 08fa907 · 08fa907
1 parent b39716c
commit 08fa907
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 300f786b2683f8bb1ec0afb6e1851183a479c86d
+refs/heads/master: 736f24d5e59d699c6e300c5da7e3bb882eddda67
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
@@ -1786,14 +1786,6 @@ SYSCALL_DEFINE1(umask, int, mask)
 }
 
 #ifdef CONFIG_CHECKPOINT_RESTORE
-static bool vma_flags_mismatch(struct vm_area_struct *vma,
-			       unsigned long required,
-			       unsigned long banned)
-{
-	return (vma->vm_flags & required) != required ||
-		(vma->vm_flags & banned);
-}
-
 static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
 {
 	struct vm_area_struct *vma;
@@ -1931,12 +1923,6 @@ static int prctl_set_mm(int opt, unsigned long addr,
 			error = -EFAULT;
 			goto out;
 		}
-#ifdef CONFIG_STACK_GROWSUP
-		if (vma_flags_mismatch(vma, VM_READ | VM_WRITE | VM_GROWSUP, 0))
-#else
-		if (vma_flags_mismatch(vma, VM_READ | VM_WRITE | VM_GROWSDOWN, 0))
-#endif
-			goto out;
 		if (opt == PR_SET_MM_START_STACK)
 			mm->start_stack = addr;
 		else if (opt == PR_SET_MM_ARG_START)