diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-05-20 13:45:28 -0400 |
| commit | 42f3504cc6bf8bf46f065d3d6d649e1963340b59 (patch) | |
| tree | 809f22845b30a1d8bf480f5372150adffaf7acc1 /arch/arm | |
| parent | 3d31bbc53b9b318924b3a2606b23875a335d1cb7 (diff) | |
| download | linux-rt-42f3504cc6bf8bf46f065d3d6d649e1963340b59.tar.gz | |
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 4b0bc37b943d..0fe9b9b3cc73 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -296,7 +296,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; /* |