git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
mm
/
fault.c
diff --git
a/arch/m68k/mm/fault.c
b/arch/m68k/mm/fault.c
index 6a94cdd0c8308cb70151d477872ccbeda2022ea8..bd66a0b20c6b79dd51142822e84db79051b1a3a9 100644
(file)
--- a/
arch/m68k/mm/fault.c
+++ b/
arch/m68k/mm/fault.c
@@
-136,7
+136,7
@@
good_area:
* the fault.
*/
- fault = handle_mm_fault(
mm,
vma, address, flags);
+ fault = handle_mm_fault(vma, address, flags);
pr_debug("handle_mm_fault returns %d\n", fault);
if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))