summaryrefslogtreecommitdiff
path: root/arch/tile
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 11:32:28 +0100
committerClark Williams <williams@redhat.com>2012-01-16 13:00:07 -0600
commit4ce1b8e52c839536accc1b0ad862cc389471a49e (patch)
treec97fbd09df47b09b73fa165bba94ebc64a10f7fa /arch/tile
parentb34c9a94936cd05eabf61ea6ece10d678db20269 (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/tile')
-rw-r--r--arch/tile/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
index 25b7b90fd620..ecdb0160e983 100644
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
@@ -346,7 +346,7 @@ static int handle_page_fault(struct pt_regs *regs,
* If we're in an interrupt, have no user context or are running in an
* atomic region then we must not take the fault.
*/
- if (in_atomic() || !mm) {
+ if (in_atomic() || !mm || current->pagefault_disabled) {
vma = NULL; /* happy compiler */
goto bad_area_nosemaphore;
}