[PATCH 49/64] arch/xtensa: 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/xtensa/mm/fault.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 6f8e3e7cccb5..5e783e5583b6 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -75,7 +75,7 @@ void do_page_fault(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)
@@ -141,7 +141,7 @@ void do_page_fault(struct pt_regs *regs)
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
        if (flags & VM_FAULT_MAJOR)
                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address);
@@ -154,7 +154,7 @@ void do_page_fault(struct pt_regs *regs)
         * Fix it, but check if it's kernel or user first..
         */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
        if (user_mode(regs)) {
                current->thread.bad_vaddr = address;
                current->thread.error_code = is_write;
@@ -173,7 +173,7 @@ void do_page_fault(struct pt_regs *regs)
         * us unable to handle the page fault gracefully.
         */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
        if (!user_mode(regs))
                bad_page_fault(regs, address, SIGKILL);
        else
@@ -181,7 +181,7 @@ void do_page_fault(struct pt_regs *regs)
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
        /* Send a sigbus, regardless of whether we were in kernel
         * or user mode.
-- 
2.13.6