projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
arch
/
sh
/
mm
/
gup.c
diff --git
a/arch/sh/mm/gup.c
b/arch/sh/mm/gup.c
index
40fa6c8
..
063c298
100644
(file)
--- a/
arch/sh/mm/gup.c
+++ b/
arch/sh/mm/gup.c
@@
-258,7
+258,8
@@
slow_irqon:
pages += nr;
ret = get_user_pages_unlocked(start,
- (end - start) >> PAGE_SHIFT, write, 0, pages);
+ (end - start) >> PAGE_SHIFT, pages,
+ write ? FOLL_WRITE : 0);
/* Have to be a bit careful with return values */
if (nr > 0) {