diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-17 11:32:28 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-11-13 11:20:55 -0500 |
| commit | 5cf99e930ace7ebfedbc8dc9f88c131cf0360e62 (patch) | |
| tree | bdfc5b710e7527e9469f8ed690fbdae5697897fc /arch/m68k | |
| parent | 22be5afa6a4bfeaae20c87bca8e1795303fc99eb (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/m68k')
| -rw-r--r-- | arch/m68k/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index a563727806bf..152361e1ce45 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -85,7 +85,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, * 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; retry: |