From 1ede35ec7affe6df78a16c36044a7b0538f5b163 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 18:17:12 +0200 Subject: ANDROID: fix up direct access to mmap_sem It's now being abstracted away, so fix up the ANDROID specific code that touches the lock to use the correct functions instead. Signed-off-by: Greg Kroah-Hartman Change-Id: I9cedb62118cd1bba7af27deb11499d312d24d7fc --- kernel/sys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/sys.c') diff --git a/kernel/sys.c b/kernel/sys.c index 70e6f1ad9a4f..93042b22ae49 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2374,7 +2374,7 @@ static int prctl_set_vma_anon_name(unsigned long start, unsigned long end, return error; if (prev) vma = prev->vm_next; - else /* madvise_remove dropped mmap_sem */ + else /* madvise_remove dropped mmap_lock */ vma = find_vma(current->mm, start); } } @@ -2402,7 +2402,7 @@ static int prctl_set_vma(unsigned long opt, unsigned long start, if (end == start) return 0; - down_write(&mm->mmap_sem); + mmap_write_lock(mm); switch (opt) { case PR_SET_VMA_ANON_NAME: @@ -2412,7 +2412,7 @@ static int prctl_set_vma(unsigned long opt, unsigned long start, error = -EINVAL; } - up_write(&mm->mmap_sem); + mmap_write_unlock(mm); return error; } -- cgit v1.2.3