summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2017-06-15 20:12:12 +0000
committermikeb <mikeb@openbsd.org>2017-06-15 20:12:12 +0000
commit175c85ce51f81bd7862c7d82a4173fcc0c9c3acc (patch)
treeec2cba7b4d9a3a91c00bff02f08ab0b15de0abcc
parentRemove the Installation section and fix a nonexistent path. (diff)
downloadwireguard-openbsd-175c85ce51f81bd7862c7d82a4173fcc0c9c3acc.tar.xz
wireguard-openbsd-175c85ce51f81bd7862c7d82a4173fcc0c9c3acc.zip
Don't defer attaching PV devices
Now that both hvn(4) and hvs(4) can perform VMBus channel operations during autoconf, it's no longer necessary to defer their attachment.
-rw-r--r--sys/dev/pv/hyperv.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/pv/hyperv.c b/sys/dev/pv/hyperv.c
index 808fcdbfd47..ec512a5ce3a 100644
--- a/sys/dev/pv/hyperv.c
+++ b/sys/dev/pv/hyperv.c
@@ -79,7 +79,6 @@ struct hv_softc *hv_sc;
int hv_match(struct device *, void *, void *);
void hv_attach(struct device *, struct device *, void *);
-void hv_deferred(void *);
void hv_set_version(struct hv_softc *);
u_int hv_gettime(struct timecounter *);
int hv_init_hypercall(struct hv_softc *);
@@ -318,16 +317,8 @@ hv_attach(struct device *parent, struct device *self, void *aux)
/* Attach heartbeat, KVP and other "internal" services */
hv_attach_icdevs(sc);
- startuphook_establish(hv_deferred, sc);
-}
-
-void
-hv_deferred(void *arg)
-{
- struct hv_softc *sc = arg;
-
- if (hv_attach_devices(sc))
- return;
+ /* Attach devices with external drivers */
+ hv_attach_devices(sc);
}
void