diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 10:32:28 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:18:40 (GMT) |
commit | e2d5d7daf459acde7c718ba4f30bbb00a66c5c1d (patch) | |
tree | 01d883bf9ae5493217a1404389e368d6ac1f1505 /arch/microblaze | |
parent | 60f0b2748306e45a2dd3ea6a42d0136439793664 (diff) | |
download | linux-fsl-qoriq-e2d5d7daf459acde7c718ba4f30bbb00a66c5c1d.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/microblaze')
-rw-r--r-- | arch/microblaze/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index fa4cf52..21d96de 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c @@ -107,7 +107,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11) is_write = 0; - if (unlikely(in_atomic() || !mm)) { + if (unlikely(in_atomic() || !mm || current->pagefault_disabled)) { if (kernel_mode(regs)) goto bad_area_nosemaphore; |