summaryrefslogtreecommitdiff
path: root/sys/dev/pv/hyperv.c
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2017-06-15 20:12:13 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2017-06-15 20:12:13 +0000
commita038907c8d30e80ca0241710b129a972792928f1 (patch)
tree7c2d580f34bb8693e14df785dd02bc8bbc77da8f /sys/dev/pv/hyperv.c
parent620d6c739fc86ca06ad76c8ac8f16909c41ac5fe (diff)
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.
Diffstat (limited to 'sys/dev/pv/hyperv.c')
-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