summaryrefslogtreecommitdiff
path: root/arch/xtensa
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 10:32:28 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:09 (GMT)
commit1aebc993d201dd35eb834e5171caef7400a323ff (patch)
treec6c06b7b5f80f59ceb80e08df3309b1be93c8a13 /arch/xtensa
parent86e57c2dc838d57324ccc333a36c32e12df4f11f (diff)
downloadlinux-fsl-qoriq-1aebc993d201dd35eb834e5171caef7400a323ff.tar.xz
mm: Fixup all fault handlers to check current->pagefault_disable
Necessary for decoupling pagefault disable from preempt count. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 4b7bc8d..0d82503 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -57,7 +57,7 @@ void do_page_fault(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) {
+ if (in_atomic() || !mm || current->pagefault_disabled) {
bad_page_fault(regs, address, SIGSEGV);
return;
}