diff --git a/[refs] b/[refs]
index d9df82dc2d35..86cd0a4a703a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daf695fca877068d7533a1b431b09210e5ad0b6b
+refs/heads/master: c07fbfd17e614a76b194f371c5331e21e6cffb54
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index a8500c61bb16..b06647517c0e 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -1362,6 +1362,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 	vma->vm_pgoff = off >> PAGE_SHIFT;
 	/* This is an IO map - tell maydump to skip this VMA */
 	vma->vm_flags |= VM_IO | VM_RESERVED;
+	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
 	fb_pgprotect(file, vma, off);
 	if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
 			     vma->vm_end - vma->vm_start, vma->vm_page_prot))