summaryrefslogtreecommitdiff
path: root/arch/frv
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 11:32:28 +0100
committerClark Williams <williams@redhat.com>2012-02-15 10:32:32 -0600
commit56c75aaf313a884eb2cbe51958dc3b24198a57a2 (patch)
tree4b1d7ef7a96da4d2d95bad76cad188f4a530845b /arch/frv
parent95d59d56816ad3e5df37ea57826ba83ffa5f0c06 (diff)
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/frv')
-rw-r--r--arch/frv/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index a325d57a83d5..3da8ec76a0aa 100644
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -79,7 +79,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
* 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;
down_read(&mm->mmap_sem);