summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 11:32:28 +0100
committerClark Williams <williams@redhat.com>2012-04-04 09:14:17 -0500
commite3b7d062b78095a5249a0c50fcccaa83c03542a3 (patch)
treef1cef485b559fa89a26ecfae8b50634a9844aee1 /arch/sh
parent995004b43e63402aaf251ca68f2c84d816594729 (diff)
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/sh')
-rw-r--r--arch/sh/mm/fault_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 7bebd044f2a1..a67ac56a8454 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -166,7 +166,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
* If we're in an interrupt, have no user context or are running
* in an atomic region then we must not take the fault:
*/
- if (in_atomic() || !mm)
+ if (in_atomic() || !mm || current->pagefault_disabled)
goto no_context;
down_read(&mm->mmap_sem);