summaryrefslogtreecommitdiff
path: root/arch/cris/mm
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 13:31:31 (GMT)
committerScott Wood <scottwood@freescale.com>2014-05-14 18:37:48 (GMT)
commit109f82573d1d3181b4bb03b709e6b26b1e9faf74 (patch)
tree892e60c035419a6737129c2b7172655c5ba36732 /arch/cris/mm
parent154980827346dbd9d3da71c17bdc8b5ab158490f (diff)
downloadlinux-fsl-qoriq-109f82573d1d3181b4bb03b709e6b26b1e9faf74.tar.xz
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/cris/mm')
-rw-r--r--arch/cris/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 69fe7c7..281e859 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -113,7 +113,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
* user context, we must not take the fault.
*/
- if (in_atomic() || !mm || current->pagefault_disabled)
+ if (!mm || pagefault_disabled())
goto no_context;
if (user_mode(regs))