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

This becomes quite straightforward with the mmrange in place.

Signed-off-by: Davidlohr Bueso <dbu...@suse.de>
---
 arch/frv/mm/fault.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 494d33b628fc..a5da0586e6cc 100644
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -86,7 +86,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long 
esr0, unsigned long ear
        if (user_mode(__frame))
                flags |= FAULT_FLAG_USER;
 
-       down_read(&mm->mmap_sem);
+       mm_read_lock(mm, &mmrange);
 
        vma = find_vma(mm, ear0);
        if (!vma)
@@ -181,7 +181,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long 
esr0, unsigned long ear
        else
                current->min_flt++;
 
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
        return;
 
 /*
@@ -189,7 +189,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long 
esr0, unsigned long ear
  * Fix it, but check if it's kernel or user first..
  */
  bad_area:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
        /* User mode accesses just cause a SIGSEGV */
        if (user_mode(__frame)) {
@@ -259,14 +259,14 @@ asmlinkage void do_page_fault(int datammu, unsigned long 
esr0, unsigned long ear
  * us unable to handle the page fault gracefully.
  */
  out_of_memory:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
        if (!user_mode(__frame))
                goto no_context;
        pagefault_out_of_memory();
        return;
 
  do_sigbus:
-       up_read(&mm->mmap_sem);
+       mm_read_unlock(mm, &mmrange);
 
        /*
         * Send a sigbus, regardless of whether we were in kernel
-- 
2.13.6

Reply via email to