Merge branch 'stable/xen-pciback-0.6.3' into stable/drivers

* stable/xen-pciback-0.6.3:
  xen/pciback: Have 'passthrough' option instead of XEN_PCIDEV_BACKEND_PASS and XEN_PCIDEV_BACKEND_VPCI
  xen/pciback: Remove the DEBUG option.
  xen/pciback: Drop two backends, squash and cleanup some code.
  xen/pciback: Print out the MSI/MSI-X (PIRQ) values
  xen/pciback: Don't setup an fake IRQ handler for SR-IOV devices.
  xen: rename pciback module to xen-pciback.
  xen/pciback: Fine-grain the spinlocks and fix BUG: scheduling while atomic cases.
  xen/pciback: Allocate IRQ handler for device that is shared with guest.
  xen/pciback: Disable MSI/MSI-X when reseting a device
  xen/pciback: guest SR-IOV support for PV guest
  xen/pciback: Register the owner (domain) of the PCI device.
  xen/pciback: Cleanup the driver based on checkpatch warnings and errors.
  xen/pciback: xen pci backend driver.

Conflicts:
	drivers/xen/Kconfig

1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 5014c6dcbdfa..03bc471c3eed 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -129,4 +129,26 @@ config XEN_TMEM
           Shim to interface in-kernel Transcendent Memory hooks
           (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 
+config XEN_PCIDEV_BACKEND
+        tristate "Xen PCI-device backend driver"
+        depends on PCI && X86 && XEN
+        depends on XEN_BACKEND
+        default m
+        help
+          The PCI device backend driver allows the kernel to export arbitrary
+          PCI devices to other guests. If you select this to be a module, you
+          will need to make sure no other driver has bound to the device(s)
+          you want to make visible to other guests.
+
+          The parameter "passthrough" allows you specify how you want the PCI
+          devices to appear in the guest. You can choose the default (0) where
+          PCI topology starts at 00.00.0, or (1) for passthrough if you want
+          the PCI devices topology appear the same as in the host.
+
+          The "hide" parameter (only applicable if backend driver is compiled
+          into the kernel) allows you to bind the PCI devices to this module
+          from the default device drivers. The argument is the list of PCI BDFs:
+          xen-pciback.hide=(03:00.0)(04:00.0)
+
+          If in doubt, say m.
 endmenu