diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-01-25 15:22:57 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-01-25 15:22:57 +0000 |
| commit | 467761a92ba0bfbc32cdfb149b39d1d9cf172457 (patch) | |
| tree | 8fc030d1c7f420066a6fda9adf463ce102469987 /sys/dev/pv | |
| parent | 5bdfb57325d30a92040d4a666a895ff8763066ba (diff) | |
Don't count the total number of Xen upcalls
Diffstat (limited to 'sys/dev/pv')
| -rw-r--r-- | sys/dev/pv/xen.c | 5 | ||||
| -rw-r--r-- | sys/dev/pv/xenstore.c | 5 | ||||
| -rw-r--r-- | sys/dev/pv/xenvar.h | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c index 99ea6c09ab4..209b1ab6035 100644 --- a/sys/dev/pv/xen.c +++ b/sys/dev/pv/xen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xen.c,v 1.34 2016/01/23 15:19:02 jsg Exp $ */ +/* $OpenBSD: xen.c,v 1.35 2016/01/25 15:22:56 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -471,7 +471,6 @@ xen_init_interrupts(struct xen_softc *sc) int i; sc->sc_irq = LAPIC_XEN_VECTOR; - evcount_attach(&sc->sc_evcnt, sc->sc_dev.dv_xname, &sc->sc_irq); /* * Clear all pending events and mask all interrupts @@ -536,8 +535,6 @@ xen_intr(void) ulong pending, selector; int port, bit, row; - sc->sc_evcnt.ec_count++; - v->evtchn_upcall_pending = 0; selector = atomic_swap_ulong(&v->evtchn_pending_sel, 0); diff --git a/sys/dev/pv/xenstore.c b/sys/dev/pv/xenstore.c index b9c2224155a..021d6260f99 100644 --- a/sys/dev/pv/xenstore.c +++ b/sys/dev/pv/xenstore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xenstore.c,v 1.20 2016/01/22 19:26:40 mikeb Exp $ */ +/* $OpenBSD: xenstore.c,v 1.21 2016/01/25 15:22:56 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -211,7 +211,8 @@ xs_attach(struct xen_softc *sc) pmap_kenter_pa((vaddr_t)xs->xs_ring, pa, PROT_READ | PROT_WRITE); pmap_update(pmap_kernel()); - if (xen_intr_establish(xs->xs_port, &xs->xs_ih, xs_intr, xs, "xs0")) + if (xen_intr_establish(xs->xs_port, &xs->xs_ih, xs_intr, xs, + sc->sc_dev.dv_xname)) goto fail_2; xs->xs_wchan = "xswrite"; diff --git a/sys/dev/pv/xenvar.h b/sys/dev/pv/xenvar.h index 82d1eaff389..bf2587e1550 100644 --- a/sys/dev/pv/xenvar.h +++ b/sys/dev/pv/xenvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xenvar.h,v 1.22 2016/01/18 19:06:48 mikeb Exp $ */ +/* $OpenBSD: xenvar.h,v 1.23 2016/01/25 15:22:56 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -68,7 +68,6 @@ struct xen_softc { #define XSF_UNPLUG_IDESEC 0x0008 /* disable emul. sec. IDE */ uint64_t sc_irq; /* IDT vector number */ - struct evcount sc_evcnt; /* upcall counter */ SLIST_HEAD(, xen_intsrc) sc_intrs; SLIST_HEAD(, xen_gntent) sc_gnts; /* grant table entries */ |