diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 10:32:28 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:11 (GMT) |
| commit | 9a58969cf8c3f2a5cf3b0cf04144ca2573758d42 (patch) | |
| tree | 314bd86e26d7f8c164b1cf70d794c3c8b0df61d6 /arch/arm | |
| parent | 8f5ce951e9a668c3b1c749fc6fee9e8b5dd4654b (diff) | |
| download | linux-fsl-qoriq-9a58969cf8c3f2a5cf3b0cf04144ca2573758d42.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/arm')
| -rw-r--r-- | arch/arm/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index eb8830a..9e92a6c 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -277,7 +277,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) * 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)) |