summaryrefslogtreecommitdiff
path: root/arch/m32r
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 15:31:31 +0200
committerClark Williams <williams@redhat.com>2012-01-16 13:00:07 -0600
commit9cf1b8ed0c9c174bfebd3eed9e4951b0dcda922b (patch)
tree767fa9deb26f85d57ada2db6a37cbcf5303081a6 /arch/m32r
parent4ce1b8e52c839536accc1b0ad862cc389471a49e (diff)
mm: pagefault_disabled()
Wrap the test for pagefault_disabled() into a helper, this allows us to remove the need for current->pagefault_disabled on !-rt kernels. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/n/tip-3yy517m8zsi9fpsf14xfaqkw@git.kernel.org
Diffstat (limited to 'arch/m32r')
-rw-r--r--arch/m32r/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index 16fa2c7f01f3..6d763f64f48c 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -115,7 +115,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
* If we're in an interrupt or have no user context or are running in an
* atomic region then we must not take the fault..
*/
- if (in_atomic() || !mm || current->pagefault_disabled)
+ if (!mm || pagefault_disabled())
goto bad_area_nosemaphore;
/* When running in the kernel we expect faults to occur only to