diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 10:32:28 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:09 (GMT) |
| commit | 1aebc993d201dd35eb834e5171caef7400a323ff (patch) | |
| tree | c6c06b7b5f80f59ceb80e08df3309b1be93c8a13 /arch/m32r | |
| parent | 86e57c2dc838d57324ccc333a36c32e12df4f11f (diff) | |
| download | linux-fsl-qoriq-1aebc993d201dd35eb834e5171caef7400a323ff.tar.xz | |
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')
| -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 3cdfa9c..1eec8af 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c @@ -114,7 +114,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 |