summaryrefslogtreecommitdiff
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 10:32:28 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-10 00:18:40 (GMT)
commite2d5d7daf459acde7c718ba4f30bbb00a66c5c1d (patch)
tree01d883bf9ae5493217a1404389e368d6ac1f1505 /arch/powerpc/mm
parent60f0b2748306e45a2dd3ea6a42d0136439793664 (diff)
downloadlinux-fsl-qoriq-e2d5d7daf459acde7c718ba4f30bbb00a66c5c1d.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/powerpc/mm')
-rw-r--r--arch/powerpc/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 51ab9e7..41230cd 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -261,7 +261,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
if (!arch_irq_disabled_regs(regs))
local_irq_enable();
- if (in_atomic() || mm == NULL) {
+ if (in_atomic() || mm == NULL || current->pagefault_disabled) {
if (!user_mode(regs)) {
rc = SIGSEGV;
goto bail;