aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2012-03-21 10:08:38 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-03-22 11:37:11 -0400
commitb9136d207f0c05c96c6b9c980fa7f7fd541a65a8 (patch)
treec5782f620475131fbd838cec21376c1a2dad7ff5 /drivers/xen
parent106b44388d8f76373149c4ea144f717b6d4d9a6d (diff)
xen: initialize platform-pci even if xen_emul_unplug=never
When xen_emul_unplug=never is specified on kernel command line reading files from /sys/hypervisor is broken (returns -EBUSY). It is caused by xen_bus dependency on platform-pci and platform-pci isn't initialized when xen_emul_unplug=never is specified. Fix it by allowing platform-pci to ignore xen_emul_unplug=never, and do not intialize xen_[blk|net]front instead. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/platform-pci.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 319dd0a94d51..2389e581e23c 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -186,11 +186,6 @@ static struct pci_driver platform_driver = {
186 186
187static int __init platform_pci_module_init(void) 187static int __init platform_pci_module_init(void)
188{ 188{
189 /* no unplug has been done, IGNORE hasn't been specified: just
190 * return now */
191 if (!xen_platform_pci_unplug)
192 return -ENODEV;
193
194 return pci_register_driver(&platform_driver); 189 return pci_register_driver(&platform_driver);
195} 190}
196 191