summaryrefslogtreecommitdiff
path: root/arch/um
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-04-10 00:18:40 (GMT)
commit10e9aed2338e85748f227947969df7dd614a9301 (patch)
tree84e3637ca78172f598b729954c5a44ff338d899d /arch/um
parente2d5d7daf459acde7c718ba4f30bbb00a66c5c1d (diff)
downloadlinux-fsl-qoriq-10e9aed2338e85748f227947969df7dd614a9301.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/um')
-rw-r--r--arch/um/kernel/trap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 9e9ad49..100a278 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -38,7 +38,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
* If the fault was during atomic operation, don't take the fault, just
* fail.
*/
- if (in_atomic() || current->pagefault_disabled)
+ if (pagefault_disabled())
goto out_nosemaphore;
if (is_user)