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 tag 'phy-for-4.4-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
nios2
/
mm
/
fault.c
diff --git
a/arch/nios2/mm/fault.c
b/arch/nios2/mm/fault.c
index 0c9b6afe69e9094815cc1e73084422368b3a2e52..b51878b0c6b87362074c68832c1b4355f7c127cc 100644
(file)
--- a/
arch/nios2/mm/fault.c
+++ b/
arch/nios2/mm/fault.c
@@
-77,7
+77,7
@@
asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause,
* If we're in an interrupt or have no user
* context, we must not take the fault..
*/
- if (
in_atomic
() || !mm)
+ if (
faulthandler_disabled
() || !mm)
goto bad_area_nosemaphore;
if (user_mode(regs))