diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-09-22 12:17:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-09-22 12:17:05 +0000 |
| commit | 48ac190da6b9fc784cf8abdf06fda19eff18bc9f (patch) | |
| tree | 39fb9fbe9c0f025611115fe94af3fd775d7acf87 /sys/arch | |
| parent | 55857a01680ba8e36f6be8755ca315667d9b1cbc (diff) | |
The MY_COUNT abstraction which depends on locore including these two
files is ridiculous. Remove it.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/apicvec.s | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/vector.s | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s index f968f1b649c..091aaa3a087 100644 --- a/sys/arch/i386/i386/apicvec.s +++ b/sys/arch/i386/i386/apicvec.s @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvec.s,v 1.24 2011/07/05 17:11:07 oga Exp $ */ +/* $OpenBSD: apicvec.s,v 1.25 2011/09/22 12:17:04 deraadt Exp $ */ /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */ /*- @@ -273,7 +273,7 @@ _C_LABEL(Xintr_##name##num): \ movl %ebx,CPL ;\ mask(num) /* mask it in hardware */ ;\ early_ack(num) /* and allow other intrs */ ;\ - incl MY_COUNT+V_INTR /* statistical info */ ;\ + 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 */ ;\ diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s index 5e043b06e12..f9c286fb634 100644 --- a/sys/arch/i386/i386/vector.s +++ b/sys/arch/i386/i386/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.15 2011/04/16 00:40:58 deraadt Exp $ */ +/* $OpenBSD: vector.s,v 1.16 2011/09/22 12:17:04 deraadt Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -33,8 +33,6 @@ #include <machine/i8259.h> #include <dev/isa/isareg.h> -#define MY_COUNT _C_LABEL(uvmexp) - /* * Macros for interrupt entry, call to handler, and exit. * @@ -109,7 +107,7 @@ _C_LABEL(Xintr_##name##num): ;\ MAKE_FRAME ;\ mask(num) /* mask it in hardware */ ;\ early_ack(num) /* and allow other intrs */ ;\ - incl MY_COUNT+V_INTR /* statistical info */ ;\ + incl _C_LABEL(uvmexp)+V_INTR /* statistical info */ ;\ movl _C_LABEL(iminlevel) + (num) * 4, %eax ;\ movl CPL,%ebx ;\ cmpl %eax,%ebx ;\ |