summaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 10:32:28 (GMT)
committerScott Wood <scottwood@freescale.com>2014-05-14 18:37:47 (GMT)
commit154980827346dbd9d3da71c17bdc8b5ab158490f (patch)
treeb88d03573c16340c439e437864bb62d4a316d886 /arch/parisc
parent07813f094869d3d7029269c0cd46115b17ab1666 (diff)
downloadlinux-fsl-qoriq-154980827346dbd9d3da71c17bdc8b5ab158490f.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/parisc')
-rw-r--r--arch/parisc/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 0293588..68b56fe 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -177,7 +177,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
int fault;
unsigned int flags;
- if (in_atomic())
+ if (in_atomic() || current->pagefault_disabled)
goto no_context;
tsk = current;