[PATCH 43/64] arch/hexagon: use mm locking wrappers

[Davidlohr Bueso]

From: Davidlohr Bueso <d...@stgolabs.net>

This becomes quite straightforward with the mmrange in place.

Signed-off-by: Davidlohr Bueso <dbu...@suse.de>
---
 arch/hexagon/kernel/vdso.c | 5 +++--
 arch/hexagon/mm/vm_fault.c | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/hexagon/kernel/vdso.c b/arch/hexagon/kernel/vdso.c
index 3ea968415539..53e3db1b54f1 100644
--- a/arch/hexagon/kernel/vdso.c
+++ b/arch/hexagon/kernel/vdso.c
@@ -64,8 +64,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, 
int uses_interp)
        int ret;
        unsigned long vdso_base;
        struct mm_struct *mm = current->mm;
+       DEFINE_RANGE_LOCK_FULL(mmrange);
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mm_write_lock_killable(mm, &mmrange))
                return -EINTR;
 
        /* Try to get it loaded right near ld.so/glibc. */
@@ -89,7 +90,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, 
int uses_interp)
        mm->context.vdso = (void *)vdso_base;
 
 up_fail:
-       up_write(&mm->mmap_sem);
+       mm_write_unlock(mm, &mmrange);
        return ret;
 }
 
diff --git a/arch/hexagon/mm/vm_fault.c b/arch/hexagon/mm/vm_fault.c
index 7d6ada2c2230..58203949486e 100644
--- a/arch/hexagon/mm/vm_fault.c
+++ b/arch/hexagon/mm/vm_fault.c
@@ -69,7 +69,7 @@ void do_page_fault(unsigned long address, long cause, struct 
pt_regs *regs)
        if (user_mode(regs))
                flags |= FAULT_FLAG_USER;
 retry:
-       down_read(&mm->mmap_sem);
+       mm_read_lock(mm, &mmrange);
        vma = find_vma(mm, address);
        if (!vma)
                goto bad_area;
@@ -122,11 +122,11 @@ void do_page_fault(unsigned long address, long cause, 
struct pt_regs *regs)
                        }
                }
 
-               up_read(&mm->mmap_sem);
+               mm_read_unlock(mm, &mmrange);
                return;
        }
 
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
        /* Handle copyin/out exception cases */
        if (!user_mode(regs))
@@ -155,7 +155,7 @@ void do_page_fault(unsigned long address, long cause, 
struct pt_regs *regs)
        return;
 
 bad_area:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
        if (user_mode(regs)) {
                info.si_signo = SIGSEGV;
-- 
2.13.6