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/m32r/mm/fault.c | |
| 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/m32r/mm/fault.c')
| -rw-r--r-- | arch/m32r/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index 2c9aeb453847..16fa2c7f01f3 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c @@ -115,7 +115,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, * If we're in an interrupt or have no user context or are running in an * atomic region then we must not take the fault.. */ - if (in_atomic() || !mm) + if (in_atomic() || !mm || current->pagefault_disabled) goto bad_area_nosemaphore; /* When running in the kernel we expect faults to occur only to |