diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2016-05-14 18:22:52 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2016-05-14 18:22:52 +0000 |
| commit | fdce57a04219d7a36c6646950fde6c8bcd97c044 (patch) | |
| tree | 0f443e2c4c306207e1367f675cf582d2e838e142 /sys/dev/hyperv | |
| parent | c9aad79aa9018f768dc594ef5bece5ce00ab42bc (diff) | |
Notes
Diffstat (limited to 'sys/dev/hyperv')
| -rw-r--r-- | sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c index bcdf0cb561848..d0bdfc47e0a7d 100644 --- a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c +++ b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c @@ -519,6 +519,7 @@ vmbus_attach(device_t dev) device_printf(dev, "VMBUS: attach dev: %p\n", dev); vmbus_devp = dev; +#ifndef EARLY_AP_STARTUP /* * If the system has already booted and thread * scheduling is possible indicated by the global @@ -526,6 +527,7 @@ vmbus_attach(device_t dev) * initialization directly. */ if (!cold) +#endif vmbus_bus_init(); bus_generic_probe(dev); @@ -538,6 +540,7 @@ vmbus_init(void) if (vm_guest != VM_GUEST_HV) return; +#ifndef EARLY_AP_STARTUP /* * If the system has already booted and thread * scheduling is possible, as indicated by the @@ -545,6 +548,7 @@ vmbus_init(void) * initialization directly. */ if (!cold) +#endif vmbus_bus_init(); } @@ -611,6 +615,9 @@ vmbus_modevent(module_t mod, int what, void *arg) switch (what) { case MOD_LOAD: +#ifdef EARLY_AP_STARTUP + vmbus_init(); +#endif vmbus_mod_load(); break; case MOD_UNLOAD: @@ -649,6 +656,7 @@ DRIVER_MODULE(vmbus, acpi, vmbus_driver, vmbus_devclass, vmbus_modevent, 0); MODULE_DEPEND(vmbus, acpi, 1, 1, 1); MODULE_VERSION(vmbus, 1); +#ifndef EARLY_AP_STARTUP /* We want to be started after SMP is initialized */ SYSINIT(vmb_init, SI_SUB_SMP + 1, SI_ORDER_FIRST, vmbus_init, NULL); - +#endif |