diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:19:12 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:18 (GMT) |
| commit | 86ba38e6f5f2fbfe9b49e153ea89593b26482019 (patch) | |
| tree | f99d2906b0eafca507f37289e68052fc105cc2dc /arch/sh/mm | |
| parent | 07c8b57b111585a617b2b456497fc9b33c00743c (diff) | |
| download | linux-fsl-qoriq-86ba38e6f5f2fbfe9b49e153ea89593b26482019.tar.xz | |
Reset to 3.12.19
Diffstat (limited to 'arch/sh/mm')
| -rw-r--r-- | arch/sh/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c index 6589138..541dc61 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c @@ -438,7 +438,7 @@ asmlinkage void __kprobes do_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 (unlikely(!mm || pagefault_disabled())) { + if (unlikely(in_atomic() || !mm)) { bad_area_nosemaphore(regs, error_code, address); return; } |