diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 10:32:28 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:47 (GMT) |
| commit | 154980827346dbd9d3da71c17bdc8b5ab158490f (patch) | |
| tree | b88d03573c16340c439e437864bb62d4a316d886 /arch/m68k | |
| parent | 07813f094869d3d7029269c0cd46115b17ab1666 (diff) | |
| download | linux-fsl-qoriq-154980827346dbd9d3da71c17bdc8b5ab158490f.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/m68k')
| -rw-r--r-- | arch/m68k/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index eb1d61f..55607e3 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -85,7 +85,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, * If we're in an interrupt or have no user * context, we must not take the fault.. */ - if (in_atomic() || !mm) + if (in_atomic() || !mm || current->pagefault_disabled) goto no_context; if (user_mode(regs)) |