diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 10:32:28 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:18:40 (GMT) |
| commit | e2d5d7daf459acde7c718ba4f30bbb00a66c5c1d (patch) | |
| tree | 01d883bf9ae5493217a1404389e368d6ac1f1505 /arch/mn10300 | |
| parent | 60f0b2748306e45a2dd3ea6a42d0136439793664 (diff) | |
| download | linux-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/mn10300')
| -rw-r--r-- | arch/mn10300/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c index 3516cbd..4886c2d 100644 --- a/arch/mn10300/mm/fault.c +++ b/arch/mn10300/mm/fault.c @@ -168,7 +168,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code, * 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) goto no_context; if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR) |