diff options
Diffstat (limited to 'arch/microblaze/mm/fault.c')
-rw-r--r-- | arch/microblaze/mm/fault.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index d46a5ebb7570..177dfc003643 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c | |||
@@ -107,14 +107,14 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, | |||
107 | if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11) | 107 | if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11) |
108 | is_write = 0; | 108 | is_write = 0; |
109 | 109 | ||
110 | if (unlikely(in_atomic() || !mm)) { | 110 | if (unlikely(faulthandler_disabled() || !mm)) { |
111 | if (kernel_mode(regs)) | 111 | if (kernel_mode(regs)) |
112 | goto bad_area_nosemaphore; | 112 | goto bad_area_nosemaphore; |
113 | 113 | ||
114 | /* in_atomic() in user mode is really bad, | 114 | /* faulthandler_disabled() in user mode is really bad, |
115 | as is current->mm == NULL. */ | 115 | as is current->mm == NULL. */ |
116 | pr_emerg("Page fault in user mode with in_atomic(), mm = %p\n", | 116 | pr_emerg("Page fault in user mode with faulthandler_disabled(), mm = %p\n", |
117 | mm); | 117 | mm); |
118 | pr_emerg("r15 = %lx MSR = %lx\n", | 118 | pr_emerg("r15 = %lx MSR = %lx\n", |
119 | regs->r15, regs->msr); | 119 | regs->r15, regs->msr); |
120 | die("Weird page fault", regs, SIGSEGV); | 120 | die("Weird page fault", regs, SIGSEGV); |