summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 15:31:31 +0200
committerClark Williams <williams@redhat.com>2011-12-28 16:25:23 -0600
commit9761b13d01f59f86b5a569c0e0f00ad3273aab92 (patch)
tree9106fa8c7c7dd909073b9c6fba291993dbdb2974 /arch/cris
parentd054d0cd167999d31fcacf9d2e28e9ceeab84316 (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/cris')
-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 2b2c2929ebab..ba9cfbe818f1 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -111,7 +111,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;
down_read(&mm->mmap_sem);