summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2014-11-24 12:47:15 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2014-11-24 12:47:15 +0000
commit249d2de492cfb4253ac0e7662fc1dfd85f277ec8 (patch)
tree64de641db57a59cbffaf5235e3e368152c422d17
parent88d3d2f0140fb0bce33e7029e4b4f69f5c5c670e (diff)
If we use the vintr cookie to point at the interrupt handler struct, we
shouldn't link it into the table.
-rw-r--r--sys/arch/sparc64/dev/cbus.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/sparc64/dev/cbus.c b/sys/arch/sparc64/dev/cbus.c
index bc22f018820..a5e8fe28ae8 100644
--- a/sys/arch/sparc64/dev/cbus.c
+++ b/sys/arch/sparc64/dev/cbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbus.c,v 1.12 2014/11/24 10:58:37 kettenis Exp $ */
+/* $OpenBSD: cbus.c,v 1.13 2014/11/24 12:47:14 kettenis Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
*
@@ -190,7 +190,11 @@ cbus_intr_establish(bus_space_tag_t t, bus_space_tag_t t0, int ihandle,
if (flags & BUS_INTR_ESTABLISH_MPSAFE)
ih->ih_mpsafe = 1;
- intr_establish(ih->ih_pil, ih);
+ if (ih->ih_name)
+ evcount_attach(&ih->ih_count, ih->ih_name, NULL);
+ else
+ evcount_attach(&ih->ih_count, "unknown", NULL);
+
ih->ih_ack = cbus_intr_ack;
err = hv_vintr_settarget(devhandle, devino, cpus->ci_upaid);