diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-31 10:54:07 -0400 |
| commit | a17bb4e2e01cd0fd2d5e1cbdab60898083ff9a36 (patch) | |
| tree | a5198db3ce9e9b481e141d73b2c03554ecd511bc /arch/cris | |
| parent | de4cbfe5a0c297ed32a7fa70a08d0424469e73e8 (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/cris')
| -rw-r--r-- | arch/cris/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index 1790f22e71a2..69fe7c73eb6d 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c @@ -113,7 +113,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs, * user context, we must not take the fault. */ - if (in_atomic() || !mm) + if (in_atomic() || !mm || current->pagefault_disabled) goto no_context; if (user_mode(regs)) |