diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-24 21:44:44 -0400 |
| commit | aafe4b955cc8f49a6058140a22811371746411d4 (patch) | |
| tree | 01d883bf9ae5493217a1404389e368d6ac1f1505 /arch/x86/mm/fault.c | |
| parent | fccf774db21123fd18acbaea9f0c1adf986a38c6 (diff) | |
| download | linux-rt-aafe4b955cc8f49a6058140a22811371746411d4.tar.gz | |
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/mm/fault.c')
| -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 5b90bbcad9f6..f250a044e015 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; } |