mm: fix anon vma naming

Fix two bugs caused by merging anon vma_naming, a typo in
mempolicy.c and a bad merge in sys.c.

Change-Id: Ia4ced447d50573e68195e95ea2f2b4d9456b8a90
Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/kernel/sys.c b/kernel/sys.c
index 1c9090bc674607cd8a8276f996e241e4457757d1..3dcf1de0eb7433a05faaa8ec50f6fba671defedd 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2368,9 +2368,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                        else
                                return -EINVAL;
                        break;
-               case PR_SET_VMA:
-                       error = prctl_set_vma(arg2, arg3, arg4, arg5);
-                       break;
                default:
                        return -EINVAL;
                }
@@ -2407,6 +2404,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                if (arg2 || arg3 || arg4 || arg5)
                        return -EINVAL;
                return current->no_new_privs ? 1 : 0;
+       case PR_SET_VMA:
+               error = prctl_set_vma(arg2, arg3, arg4, arg5);
+               break;
        default:
                error = -EINVAL;
                break;

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 7b349aafe79d2f78c3c387c50a573625533502d7..bf12a3fc120c11a1b8e7a9114016232b98224985 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -728,7 +728,7 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
                        ((vmstart - vma->vm_start) >> PAGE_SHIFT);
                prev = vma_merge(mm, prev, vmstart, vmend, vma->vm_flags,
                                  vma->anon_vma, vma->vm_file, pgoff,
-                                 new_pol, vma_get_anon_name(name));
+                                 new_pol, vma_get_anon_name(vma));
                if (prev) {
                        vma = prev;
                        next = vma->vm_next;