aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 15:31:31 +0200
committerSteven Rostedt <rostedt@goodmis.org>2013-11-13 11:20:55 -0500
commitf77ab7c6d0a9807d253f2ff5539fdbce2f49ba9b (patch)
treef9ae1bde3c72a813ce00e0276f160b5c54c942d0 /arch/m68k
parent5cf99e930ace7ebfedbc8dc9f88c131cf0360e62 (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/m68k')
-rw-r--r--arch/m68k/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index 152361e1ce45..9ea40dbb1ca0 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -85,7 +85,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
* If we're in an interrupt or have no user
* context, we must not take the fault..
*/
- if (in_atomic() || !mm || current->pagefault_disabled)
+ if (!mm || pagefault_disabled())
goto no_context;
retry: