diff options
| author | kato <kato@FreeBSD.org> | 1997-09-08 08:40:53 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-09-08 08:40:53 +0000 |
| commit | 12e4ae6425d3e65e3e6f9d2506d52b27a56c890d (patch) | |
| tree | e26072797c947e847aea8a2dbda15bb5b7ecc5fe /sys/pc98 | |
| parent | 9a9d679136b336c78faf890ba54ca9081966e345 (diff) | |
| download | FreeBSD-src-12e4ae6425d3e65e3e6f9d2506d52b27a56c890d.zip FreeBSD-src-12e4ae6425d3e65e3e6f9d2506d52b27a56c890d.tar.gz | |
Synchronize with sys/i386/i386/microtime.s revision 1.33.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/microtime.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/i386/microtime.s b/sys/pc98/i386/microtime.s index f1ac0e1..16c3527 100644 --- a/sys/pc98/i386/microtime.s +++ b/sys/pc98/i386/microtime.s @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.15 1997/09/01 10:42:43 kato Exp $ + * $Id: microtime.s,v 1.16 1997/09/03 12:41:16 kato Exp $ */ #include "opt_cpu.h" @@ -48,7 +48,7 @@ #include <i386/isa/timerreg.h> #ifdef SMP -#include <machine/smptests.h> /** USE_CLOCKLOCK */ +#include <machine/smptests.h> /** USE_CLOCKLOCK, REAL_MCPL */ #endif ENTRY(microtime) @@ -126,14 +126,14 @@ ENTRY(microtime) movl _timer0_max_count, %edx /* prepare for 2 uses */ #ifdef APIC_IO -#if defined(REAL_MCPL) /* XXX do we need this??? */ +#ifdef REAL_MCPL /* XXX do we need this??? */ pushl %ecx /* s_lock destroys %eax, %ecx */ CPL_LOCK /* MP-safe, INTs disabled above */ popl %ecx /* restore %ecx */ movl _ipending, %eax movl $0, _cpl_lock /* s_unlock would destroy %eax */ testl %eax, _mask8254 /* is soft timer interrupt pending? */ -#else /* REAL_MCPL */ +#else /** XXX FIXME: take our chances with a race, is this OK? */ movl _ipending, %eax testl %eax, _mask8254 /* is soft timer interrupt pending? */ |
