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/um | |
| 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/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 5c3aef7..9e9ad49 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -38,7 +38,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() || current->pagefault_disabled) goto out_nosemaphore; if (is_user) |