diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 10:32:28 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:11 (GMT) |
| commit | 9a58969cf8c3f2a5cf3b0cf04144ca2573758d42 (patch) | |
| tree | 314bd86e26d7f8c164b1cf70d794c3c8b0df61d6 /arch/x86 | |
| parent | 8f5ce951e9a668c3b1c749fc6fee9e8b5dd4654b (diff) | |
| download | linux-fsl-qoriq-9a58969cf8c3f2a5cf3b0cf04144ca2573758d42.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/x86')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 5b90bbcad9..f250a04 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1098,7 +1098,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code) * 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 (unlikely(in_atomic() || !mm)) { + if (unlikely(in_atomic() || !mm || current->pagefault_disabled)) { bad_area_nosemaphore(regs, error_code, address); return; } |