projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
arch
/
x86
/
mm
/
fault.c
diff --git
a/arch/x86/mm/fault.c
b/arch/x86/mm/fault.c
index d22161ab941d51aee4ba4ec74d8858bc8b164c10..dc802306045653be7177fd619cdc3dffbcd92815 100644
(file)
--- a/
arch/x86/mm/fault.c
+++ b/
arch/x86/mm/fault.c
@@
-1353,7
+1353,7
@@
good_area:
* the fault. Since we never set FAULT_FLAG_RETRY_NOWAIT, if
* we get VM_FAULT_RETRY back, the mmap_sem has been unlocked.
*/
* the fault. Since we never set FAULT_FLAG_RETRY_NOWAIT, if
* we get VM_FAULT_RETRY back, the mmap_sem has been unlocked.
*/
- fault = handle_mm_fault(
mm,
vma, address, flags);
+ fault = handle_mm_fault(vma, address, flags);
major |= fault & VM_FAULT_MAJOR;
/*
major |= fault & VM_FAULT_MAJOR;
/*
This page took
0.03852 seconds
and
5
git commands to generate.