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

Commit 94d4c4cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 

* 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/xenbus: making backend support modular is too complex
  xen/pci: Make xen-pcifront be dependent on XEN_XENBUS_FRONTEND
  xen/xenbus: fixup checkpatch issues in xenbus_probe*
  xen/netfront: select XEN_XENBUS_FRONTEND
  xen/xenbus: clean up noise in xenbus_probe_frontend.c
  xen/xenbus: clean up noise in xenbus_probe_backend.c
  xen/xenbus: clean up noise in xenbus_probe.c
  xen/xenbus: cleanup debug noise in xenbus_comms.c
  xen/xenbus: clean up error handling
  xen/xenbus: make frontend bus GPL
  xen/xenbus: make sure backend bus is registered earlier
  xenbus/frontend: register bus earlier
  xen: remove xen/evtchn.h
  xen: add backend driver support
  xen: separate out frontend xenbus
parents 2818ef50 329620a8

drivers/block/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ config XEN_BLKDEV_FRONTEND 
	tristate "Xen virtual block device support"

	depends on XEN

	default y

	select XEN_XENBUS_FRONTEND

	help

	  This driver implements the front-end of the Xen virtual

	  block device driver.  It communicates with a back-end driver

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2963,6 +2963,7 @@ config TILE_NET 
config XEN_NETDEV_FRONTEND

	tristate "Xen network device frontend driver"

	depends on XEN

	select XEN_XENBUS_FRONTEND

	default y

	help

	  The network device frontend driver allows the kernel to

drivers/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ config XEN_PCIDEV_FRONTEND 
        depends on PCI && X86 && XEN

        select HOTPLUG

        select PCI_XEN

	select XEN_XENBUS_FRONTEND

        default y

        help

          The PCI device frontend driver allows the kernel to import arbitrary

drivers/xen/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -29,6 +29,14 @@ config XEN_DEV_EVTCHN 
	  firing.

	  If in doubt, say yes.



config XEN_BACKEND

	bool "Backend driver support"

	depends on XEN_DOM0

	default y

	help

	  Support for backend device drivers that provide I/O services

	  to other virtual machines.



config XENFS

	tristate "Xen filesystem"

	default y
@@ -62,6 +70,9 @@ config XEN_SYS_HYPERVISOR 
	 virtual environment, /sys/hypervisor will still be present,

	 but will have no xen contents.



config XEN_XENBUS_FRONTEND

       tristate



config XEN_PLATFORM_PCI

	tristate "xen platform pci device driver"

	depends on XEN_PVHVM

drivers/xen/xenbus/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -5,3 +5,8 @@ xenbus-objs += xenbus_client.o 
xenbus-objs += xenbus_comms.o

xenbus-objs += xenbus_xs.o

xenbus-objs += xenbus_probe.o



xenbus-be-objs-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o

xenbus-objs += $(xenbus-be-objs-y)



obj-$(CONFIG_XEN_XENBUS_FRONTEND) += xenbus_probe_frontend.o