projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[firefly-linux-kernel-4.4.55.git]
/
arch
/
microblaze
/
mm
/
fault.c
diff --git
a/arch/microblaze/mm/fault.c
b/arch/microblaze/mm/fault.c
index d46a5ebb7570e07869ea03b9b995374aa3bff82e..177dfc0036436284d4e016b0987e4516faa7f445 100644
(file)
--- 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,
if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11)
is_write = 0;
if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11)
is_write = 0;
- if (unlikely(
in_atomic
() || !mm)) {
+ if (unlikely(
faulthandler_disabled
() || !mm)) {
if (kernel_mode(regs))
goto bad_area_nosemaphore;
if (kernel_mode(regs))
goto bad_area_nosemaphore;
- /*
in_atomic
() in user mode is really bad,
+ /*
faulthandler_disabled
() in user mode is really bad,
as is current->mm == NULL. */
as is current->mm == NULL. */
- pr_emerg("Page fault in user mode with
in_atomic
(), mm = %p\n",
-
mm);
+ pr_emerg("Page fault in user mode with
faulthandler_disabled
(), mm = %p\n",
+ mm);
pr_emerg("r15 = %lx MSR = %lx\n",
regs->r15, regs->msr);
die("Weird page fault", regs, SIGSEGV);
pr_emerg("r15 = %lx MSR = %lx\n",
regs->r15, regs->msr);
die("Weird page fault", regs, SIGSEGV);