[PATCH 47/64] arch/microblaze: 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/microblaze/mm/fault.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c
index fd49efbdfbf4..072e0d79aab5 100644
--- a/arch/microblaze/mm/fault.c
+++ b/arch/microblaze/mm/fault.c
@@ -139,12 +139,12 @@ void do_page_fault(struct pt_regs *regs, unsigned long 
address,
         * source.  If this is invalid we can skip the address space check,
         * thus avoiding the deadlock.
         */
-       if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
+       if (unlikely(!mm_read_trylock(mm, &mmrange))) {
                if (kernel_mode(regs) && !search_exception_tables(regs->pc))
                        goto bad_area_nosemaphore;
 
 retry:
-               down_read(&mm->mmap_sem);
+               mm_read_lock(mm, &mmrange);
        }
 
        vma = find_vma(mm, address);
@@ -251,7 +251,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long 
address,
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
        /*
         * keep track of tlb+htab misses that are good addrs but
@@ -262,7 +262,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long 
address,
        return;
 
 bad_area:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
 bad_area_nosemaphore:
        pte_errors++;
@@ -286,7 +286,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long 
address,
  * 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
@@ -294,7 +294,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long 
address,
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
        if (user_mode(regs)) {
                info.si_signo = SIGBUS;
                info.si_errno = 0;
-- 
2.13.6