projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
misc
/
mic
/
scif
/
scif_rma.c
diff --git
a/drivers/misc/mic/scif/scif_rma.c
b/drivers/misc/mic/scif/scif_rma.c
index
e0203b1
..
f806a44
100644
(file)
--- a/
drivers/misc/mic/scif/scif_rma.c
+++ b/
drivers/misc/mic/scif/scif_rma.c
@@
-1396,8
+1396,7
@@
retry:
pinned_pages->nr_pages = get_user_pages(
(u64)addr,
nr_pages,
- !!(prot & SCIF_PROT_WRITE),
- 0,
+ (prot & SCIF_PROT_WRITE) ? FOLL_WRITE : 0,
pinned_pages->pages,
NULL);
up_write(&mm->mmap_sem);