From 08fa9073fa55106ae254a7e98de7c5d89f4ddd48 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 7 Jun 2012 14:21:12 -0700 Subject: [PATCH] --- yaml --- r: 310551 b: refs/heads/master c: 736f24d5e59d699c6e300c5da7e3bb882eddda67 h: refs/heads/master i: 310549: 45ae0f56196d11f9b7954ac9724734d8869940c5 310547: 1a69a8aa535058891f9a775ace49bbf3cf6b26b2 310543: f102a50b9769d870681a9f32b2d261b7e293688c v: v3 --- [refs] | 2 +- trunk/kernel/sys.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index fa184c680fa9..23f274a2732b 100644 --- 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 index 0ec1942ba7ea..f0ec44dcd415 100644 --- 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)