diff options
Diffstat (limited to 'arch/mips/mm/fault.c')
-rw-r--r-- | arch/mips/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index 7ff8637e530d..36c0f26fac6b 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c | |||
@@ -21,10 +21,10 @@ | |||
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/kprobes.h> | 22 | #include <linux/kprobes.h> |
23 | #include <linux/perf_event.h> | 23 | #include <linux/perf_event.h> |
24 | #include <linux/uaccess.h> | ||
24 | 25 | ||
25 | #include <asm/branch.h> | 26 | #include <asm/branch.h> |
26 | #include <asm/mmu_context.h> | 27 | #include <asm/mmu_context.h> |
27 | #include <asm/uaccess.h> | ||
28 | #include <asm/ptrace.h> | 28 | #include <asm/ptrace.h> |
29 | #include <asm/highmem.h> /* For VMALLOC_END */ | 29 | #include <asm/highmem.h> /* For VMALLOC_END */ |
30 | #include <linux/kdebug.h> | 30 | #include <linux/kdebug.h> |
@@ -94,7 +94,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, | |||
94 | * If we're in an interrupt or have no user | 94 | * If we're in an interrupt or have no user |
95 | * context, we must not take the fault.. | 95 | * context, we must not take the fault.. |
96 | */ | 96 | */ |
97 | if (in_atomic() || !mm) | 97 | if (faulthandler_disabled() || !mm) |
98 | goto bad_area_nosemaphore; | 98 | goto bad_area_nosemaphore; |
99 | 99 | ||
100 | if (user_mode(regs)) | 100 | if (user_mode(regs)) |