| From c095f66000760bcee5414f538b4b232d4d0ca90c Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 24 Jul 2009 15:20:58 +0200 |
| Subject: [PATCH] arm: Prepare decoupling page-fault logic from preempt-count |
| |
| commit 9cc0ea6be0eafee87ffe5e4d7bb9cc4594235693 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c |
| index 10e0680..7aa9b88 100644 |
| --- a/arch/arm/mm/fault.c |
| +++ b/arch/arm/mm/fault.c |
| @@ -273,7 +273,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; |
| |
| /* |
| -- |
| 1.7.1.1 |
| |
