Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eae6fa9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 02412f49 df11303c

drivers/input/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ config XEN_KBDDEV_FRONTEND 
	tristate "Xen virtual keyboard and mouse support"

	depends on XEN_FBDEV_FRONTEND

	default y

	select XEN_XENBUS_FRONTEND

	help

	  This driver implements the front-end of the Xen virtual

	  keyboard and mouse device driver.  It communicates with a back-end

drivers/video/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2066,6 +2066,7 @@ config XEN_FBDEV_FRONTEND 
	select FB_SYS_IMAGEBLIT

	select FB_SYS_FOPS

	select FB_DEFERRED_IO

	select XEN_XENBUS_FRONTEND

	default y

	help

	  This driver implements the front-end of the Xen virtual

drivers/video/broadsheetfb.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev) 
	par->read_reg = broadsheet_read_reg;

	init_waitqueue_head(&par->waitq);



	info->flags = FBINFO_FLAG_DEFAULT;

	info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;



	info->fbdefio = &broadsheetfb_defio;

	fb_deferred_io_init(info);

drivers/video/fb_defio.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/video/hecubafb.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev) 
	par->send_command = apollo_send_command;

	par->send_data = apollo_send_data;



	info->flags = FBINFO_FLAG_DEFAULT;

	info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;



	info->fbdefio = &hecubafb_defio;

	fb_deferred_io_init(info);