diff options
Diffstat (limited to 'arch/powerpc/mm/fault.c')
| -rw-r--r-- | arch/powerpc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 26fb6b990b0a..d89a78ae3eb1 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
| @@ -159,7 +159,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, | |||
| 159 | } | 159 | } |
| 160 | #endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/ | 160 | #endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/ |
| 161 | 161 | ||
| 162 | if (in_atomic() || mm == NULL) { | 162 | if (in_atomic() || mm == NULL || current->pagefault_disabled) { |
| 163 | if (!user_mode(regs)) | 163 | if (!user_mode(regs)) |
| 164 | return SIGSEGV; | 164 | return SIGSEGV; |
| 165 | /* in_atomic() in user mode is really bad, | 165 | /* in_atomic() in user mode is really bad, |