Merge branches 'fixes' and 'misc' into for-linus

[~andy/linux] / drivers / xen / xenbus / xenbus_probe_frontend.c

diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
index 129bf84c19ec999f5e239c1b7168089955a29bec..cb385c10d2b15679729810dd24e5c9bb3cd9117c 100644 (file)
--- a/drivers/xen/xenbus/xenbus_probe_frontend.c
+++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -496,7 +496,7 @@ subsys_initcall(xenbus_probe_frontend_init);
 #ifndef MODULE
 static int __init boot_wait_for_devices(void)
 {
-       if (xen_hvm_domain() && !xen_platform_pci_unplug)
+       if (!xen_has_pv_devices())
                return -ENODEV;
 
        ready_to_wait_for_devices = 1;