diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:34:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:34:40 -0800 |
| commit | eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5 (patch) | |
| tree | 34f7d08d5f9913c3b5c3bca152953a173ded1e05 /drivers/video/fb_defio.c | |
| parent | 02412f49f6a7e35753d9af49d92662fb562fc9fa (diff) | |
| parent | df11303c90406426847255ba498607f15a472a0a (diff) | |
| download | op-kernel-dev-eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5.zip op-kernel-dev-eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5.tar.gz | |
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
Fix toogle whether xenbus driver should be built as module or part of kernel.
Diffstat (limited to 'drivers/video/fb_defio.c')
| -rw-r--r-- | drivers/video/fb_defio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index e59c083..44ce908 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c @@ -144,7 +144,9 @@ static const struct address_space_operations fb_deferred_io_aops = { static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma) { vma->vm_ops = &fb_deferred_io_vm_ops; - vma->vm_flags |= ( VM_IO | VM_RESERVED | VM_DONTEXPAND ); + vma->vm_flags |= ( VM_RESERVED | VM_DONTEXPAND ); + if (!(info->flags & FBINFO_VIRTFB)) + vma->vm_flags |= VM_IO; vma->vm_private_data = info; return 0; } |
