summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-07-09 16:09:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-07-09 16:09:48 +0000
commitde5d303a9cb010306e55db34e84d5551a1654095 (patch)
tree948c5ae0f4a5815a4ab525a3661fad6aa10c2091
parentd3ace9dbe7c9c5915756b91f766f45fbe7c0204e (diff)
Remove apic_intrcount counting in the interrupt handlers. Not that useful
anymore as a debugging tool, and it is in a rather critical path. ok kettenis
-rw-r--r--sys/arch/i386/i386/apicvec.s3
-rw-r--r--sys/arch/i386/i386/ioapic.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s
index 091aaa3a087..020e499f4c6 100644
--- a/sys/arch/i386/i386/apicvec.s
+++ b/sys/arch/i386/i386/apicvec.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: apicvec.s,v 1.25 2011/09/22 12:17:04 deraadt Exp $ */
+/* $OpenBSD: apicvec.s,v 1.26 2012/07/09 16:09:47 deraadt Exp $ */
/* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */
/*-
@@ -275,7 +275,6 @@ _C_LABEL(Xintr_##name##num): \
early_ack(num) /* and allow other intrs */ ;\
incl _C_LABEL(uvmexp)+V_INTR /* statistical info */ ;\
sti ;\
- incl _C_LABEL(apic_intrcount)(,%eax,4) ;\
movl _C_LABEL(apic_intrhand)(,%eax,4),%ebx /* chain head */ ;\
testl %ebx,%ebx ;\
jz _C_LABEL(Xstray_##name##num) ;\
diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c
index 7ab93fc2e46..fef840abb44 100644
--- a/sys/arch/i386/i386/ioapic.c
+++ b/sys/arch/i386/i386/ioapic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioapic.c,v 1.26 2011/04/16 00:40:58 deraadt Exp $ */
+/* $OpenBSD: ioapic.c,v 1.27 2012/07/09 16:09:47 deraadt Exp $ */
/* $NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $ */
/*-
@@ -399,7 +399,6 @@ ioapic_activate(struct device *self, int act)
*/
struct intrhand *apic_intrhand[256];
-int apic_intrcount[256];
int apic_maxlevel[256];