aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-03-09 15:56:12 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-03-09 15:56:12 +0100
commit0026c91c773c0d29b151b0be20b95a3fa2464071 (patch)
tree707b368db07859de03e84c3c362d4efbab93e2d1
parentf736587680521b6e429a27ae1bf8383be08d27b2 (diff)
downloadxen-0026c91c773c0d29b151b0be20b95a3fa2464071.tar.gz
xen-0026c91c773c0d29b151b0be20b95a3fa2464071.tar.bz2
xen-0026c91c773c0d29b151b0be20b95a3fa2464071.zip
Explain disadvantages of building pciback as a module in Kconfig help.
Fix a module-loading bug in pciback. From: Jan Beulich Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r--linux-2.6-xen-sparse/drivers/xen/Kconfig4
-rw-r--r--linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig
index eaf774af55..5cc8484a2a 100644
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig
@@ -35,7 +35,9 @@ config XEN_PCIDEV_BACKEND
default XEN_PRIVILEGED_GUEST
help
The PCI device backend driver allows the kernel to export arbitrary
- PCI devices to other guests.
+ 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.
choice
prompt "PCI Backend Mode"
diff --git a/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c b/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c
index 2e0b8a0110..f3c6f019e0 100644
--- a/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c
+++ b/linux-2.6-xen-sparse/drivers/xen/pciback/pci_stub.c
@@ -378,7 +378,7 @@ fs_initcall(pcistub_init);
static int __init pciback_init(void)
{
-#ifndef MODULE
+#ifdef MODULE
int err;
err = pcistub_init();