diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-04-10 16:36:35 -0500 |
commit | 829ca793e500ae3514c1c5e0e28d626afe9b1ddc (patch) | |
tree | cbc9784c08c85b32f82829eefd630cc8b15567f9 /arch/alpha | |
parent | b174ae88675c254599149f867d70d52d247f7075 (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/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 fadd5f882ff9..6d73e1bbf8c2 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 |