diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:23 -0600 |
| commit | d054d0cd167999d31fcacf9d2e28e9ceeab84316 (patch) | |
| tree | 608864a4c870902b8baf5ac4caa0693d3e95b2cb /arch/x86 | |
| parent | c87a239812dc175ff292093a932597e6622f5dca (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/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 5db0490deb07..191015fd836b 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1084,7 +1084,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; } |