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-05-14 18:37:48 (GMT)
commit109f82573d1d3181b4bb03b709e6b26b1e9faf74 (patch)
tree892e60c035419a6737129c2b7172655c5ba36732 /arch/um
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/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)