diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-04-10 14:33:55 -0400 |
| commit | 32c069f7bc6e971bfd7acf37cb8be7252abb62d6 (patch) | |
| tree | cbc9784c08c85b32f82829eefd630cc8b15567f9 /arch/um | |
| parent | ae2aad80a96cc2aad3eb9aee0be8b300755eb1f4 (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/um')
| -rw-r--r-- | arch/um/kernel/trap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index dafc94715950..a28340023e13 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -37,7 +37,7 @@ int handle_page_fault(unsigned long address, unsigned long ip, * If the fault was during atomic operation, don't take the fault, just * fail. */ - if (in_atomic()) + if (in_atomic() || !mm || current->pagefault_disabled) goto out_nosemaphore; down_read(&mm->mmap_sem); |