projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into sched/core, to resolve conflict
[cascardo/linux.git]
/
arch
/
nios2
/
mm
/
fault.c
diff --git
a/arch/nios2/mm/fault.c
b/arch/nios2/mm/fault.c
index
0c9b6af
..
b51878b
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))