aboutsummaryrefslogtreecommitdiff
path: root/arch/avr32
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 15:31:31 +0200
committerSteven Rostedt <rostedt@goodmis.org>2012-04-10 14:33:55 -0400
commit8c40eceb3d91acc30fbd035de582d97a1a72aba7 (patch)
tree655eb44f0c649788a68f5eb3905f3e2810f5c299 /arch/avr32
parent32c069f7bc6e971bfd7acf37cb8be7252abb62d6 (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/avr32')
-rw-r--r--arch/avr32/mm/fault.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
index 623a027a6926..155ad8daecf9 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -81,8 +81,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
* If we're in an interrupt or have no user context, we must
* not take the fault...
*/
- if (in_atomic() || !mm || regs->sr & SYSREG_BIT(GM) ||
- current->pagefault_disabled)
+ if (!mm || regs->sr & SYSREG_BIT(GM) || pagefault_disabled())
goto no_context;
local_irq_enable();