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/alpha | |
| 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/alpha')
| -rw-r--r-- | arch/alpha/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 98838a0..4d6b120 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -107,7 +107,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, /* If we're in an interrupt context, or have no user context, we must not take the fault. */ - if (!mm || in_atomic()) + if (!mm || in_atomic() || current->pagefault_disabled) goto no_context; #ifdef CONFIG_ALPHA_LARGE_VMALLOC |