summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-13 08:16:40 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-13 08:16:40 +0100
commit74239ac259519a98f4c32439326afe7e7eb64459 (patch)
treea3e9a1ae0dc6634e7aa669c8881e425634094257 /drivers/video
parenta75dcb5848359f488c32c0aef8711d9bd37a77b8 (diff)
parent86e4ee760ef2f7571e233a3abf065ffd0bb4089d (diff)
downloadlinux-stable-74239ac259519a98f4c32439326afe7e7eb64459.tar.gz
linux-stable-74239ac259519a98f4c32439326afe7e7eb64459.tar.bz2
linux-stable-74239ac259519a98f4c32439326afe7e7eb64459.zip
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/pvr2fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 3b1ca4411073..a2564ab91e62 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -686,8 +686,8 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
if (!pages)
return -ENOMEM;
- ret = get_user_pages_unlocked((unsigned long)buf, nr_pages, WRITE,
- 0, pages);
+ ret = get_user_pages_unlocked((unsigned long)buf, nr_pages, pages,
+ FOLL_WRITE);
if (ret < nr_pages) {
nr_pages = ret;