diff options
| author |   mikeb <mikeb@openbsd.org> | 2016-12-21 12:17:15 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2016-12-21 12:17:15 +0000 |
| commit | b44c9f5914d48c4b10cbb7eb5d8d6e8ff265c80a (patch) | |
| tree | ca405eb60950f8f1589bd8f18e46d81a29b4f9dd | |
| parent | Remove recursive splsoftnet(). (diff) | |
| download | wireguard-openbsd-b44c9f5914d48c4b10cbb7eb5d8d6e8ff265c80a.tar.xz wireguard-openbsd-b44c9f5914d48c4b10cbb7eb5d8d6e8ff265c80a.zip | |
Remove the rwlock paranoia since we're under KERNEL_LOCK anyway
| -rw-r--r-- | sys/dev/pv/xen.c | 12 | ||||
| -rw-r--r-- | sys/dev/pv/xenvar.h | 7 |
2 files changed, 3 insertions, 16 deletions
diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c index fcf7ab44ae7..c1a05e32816 100644 --- a/sys/dev/pv/xen.c +++ b/sys/dev/pv/xen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xen.c,v 1.69 2016/12/19 21:07:10 mikeb Exp $ */ +/* $OpenBSD: xen.c,v 1.70 2016/12/21 12:17:15 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -1309,10 +1309,6 @@ xen_probe_devices(struct xen_softc *sc) xst.xst_cookie = sc->sc_xs; xst.xst_flags |= XST_POLL; - rw_init(&sc->sc_devlck, "xenprobe"); - - rw_enter_write(&sc->sc_devlck); - if ((error = xs_cmd(&xst, XS_LIST, "device", &iovp1, &iov1_cnt)) != 0) return (error); @@ -1355,8 +1351,6 @@ xen_probe_devices(struct xen_softc *sc) } out: - rw_exit_write(&sc->sc_devlck); - if (iovp2) xs_resfree(&xst, iovp2, iov2_cnt); xs_resfree(&xst, iovp1, iov1_cnt); @@ -1379,8 +1373,6 @@ xen_hotplug(void *arg) xst.xst_id = 0; xst.xst_cookie = sc->sc_xs; - rw_enter_write(&sc->sc_devlck); - snprintf(path, sizeof(path), "device/%s", xdl->dl_node); if ((error = xs_cmd(&xst, XS_LIST, path, &iovp, &iov_cnt)) != 0) return; @@ -1423,8 +1415,6 @@ xen_hotplug(void *arg) } } - rw_exit_write(&sc->sc_devlck); - free(seen, M_TEMP, iov_cnt); xs_resfree(&xst, iovp, iov_cnt); diff --git a/sys/dev/pv/xenvar.h b/sys/dev/pv/xenvar.h index f0eae5636a2..82260f5244a 100644 --- a/sys/dev/pv/xenvar.h +++ b/sys/dev/pv/xenvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xenvar.h,v 1.44 2016/12/19 21:07:10 mikeb Exp $ */ +/* $OpenBSD: xenvar.h,v 1.45 2016/12/21 12:17:15 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -114,14 +114,11 @@ struct xen_softc { * Xenstore */ struct xs_softc *sc_xs; /* xenstore softc */ - struct task sc_ctltsk; /* control task */ - struct xen_devlists sc_devlists; /* device lists heads */ - struct rwlock sc_devlck; }; -extern struct xen_softc *xen_sc; +extern struct xen_softc *xen_sc; struct xen_attach_args { char xa_name[16]; |