[PATCH 45/64] arch/m32r: use mm locking wrappers

[Davidlohr Bueso]

From: Davidlohr Bueso 

This becomes quite straightforward with the mmrange in place.

Signed-off-by: Davidlohr Bueso 
---
 arch/m32r/mm/fault.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index 0129aea46729..2c6b58ecfc53 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -137,11 +137,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
 * source.  If this is invalid we can skip the address space check,
 * thus avoiding the deadlock.
 */
-   if (!down_read_trylock(>mmap_sem)) {
+   if (!mm_read_trylock(mm, )) {
if ((error_code & ACE_USERMODE) == 0 &&
!search_exception_tables(regs->psw))
goto bad_area_nosemaphore;
-   down_read(>mmap_sem);
+   mm_read_lock(mm, );
}
 
vma = find_vma(mm, address);
@@ -213,7 +213,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
else
tsk->min_flt++;
set_thread_fault_code(0);
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
return;
 
 /*
@@ -221,7 +221,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
  * Fix it, but check if it's kernel or user first..
  */
 bad_area:
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
 
 bad_area_nosemaphore:
/* User mode accesses just cause a SIGSEGV */
@@ -274,14 +274,14 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
if (!(error_code & ACE_USERMODE))
goto no_context;
pagefault_out_of_memory();
return;
 
 do_sigbus:
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
 
/* Kernel mode? Handle exception or die */
if (!(error_code & ACE_USERMODE))
-- 
2.13.6

[PATCH 45/64] arch/m32r: use mm locking wrappers

[Davidlohr Bueso]

From: Davidlohr Bueso 

This becomes quite straightforward with the mmrange in place.

Signed-off-by: Davidlohr Bueso 
---
 arch/m32r/mm/fault.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index 0129aea46729..2c6b58ecfc53 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -137,11 +137,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
 * source.  If this is invalid we can skip the address space check,
 * thus avoiding the deadlock.
 */
-   if (!down_read_trylock(>mmap_sem)) {
+   if (!mm_read_trylock(mm, )) {
if ((error_code & ACE_USERMODE) == 0 &&
!search_exception_tables(regs->psw))
goto bad_area_nosemaphore;
-   down_read(>mmap_sem);
+   mm_read_lock(mm, );
}
 
vma = find_vma(mm, address);
@@ -213,7 +213,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
else
tsk->min_flt++;
set_thread_fault_code(0);
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
return;
 
 /*
@@ -221,7 +221,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
  * Fix it, but check if it's kernel or user first..
  */
 bad_area:
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
 
 bad_area_nosemaphore:
/* User mode accesses just cause a SIGSEGV */
@@ -274,14 +274,14 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long error_code,
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
if (!(error_code & ACE_USERMODE))
goto no_context;
pagefault_out_of_memory();
return;
 
 do_sigbus:
-   up_read(>mmap_sem);
+   mm_read_unlock(mm, );
 
/* Kernel mode? Handle exception or die */
if (!(error_code & ACE_USERMODE))
-- 
2.13.6