From 28b2e8ef73dff54ef9c1a6a826f8753ef1643142 Mon Sep 17 00:00:00 2001 From: KATO Takenori Date: Mon, 8 Sep 1997 08:40:53 +0000 Subject: [PATCH] Synchronize with sys/i386/i386/microtime.s revision 1.33. --- sys/pc98/i386/microtime.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/pc98/i386/microtime.s b/sys/pc98/i386/microtime.s index f1ac0e13fbe..16c35272984 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 #ifdef SMP -#include /** USE_CLOCKLOCK */ +#include /** 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? */