diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:32 -0600 |
| commit | 56c75aaf313a884eb2cbe51958dc3b24198a57a2 (patch) | |
| tree | 4b1d7ef7a96da4d2d95bad76cad188f4a530845b /arch/avr32 | |
| parent | 95d59d56816ad3e5df37ea57826ba83ffa5f0c06 (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/avr32')
| -rw-r--r-- | arch/avr32/mm/fault.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index f7040a1e399f..623a027a6926 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -81,7 +81,8 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs) * If we're in an interrupt or have no user context, we must * not take the fault... */ - if (in_atomic() || !mm || regs->sr & SYSREG_BIT(GM)) + if (in_atomic() || !mm || regs->sr & SYSREG_BIT(GM) || + current->pagefault_disabled) goto no_context; local_irq_enable(); |