diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-09-01 07:45:37 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-09-01 07:45:37 +0000 |
| commit | e771ecca0f52de0eb9e330af62ef2a6685ff7bc6 (patch) | |
| tree | 792ab41dec7c5dfa5f548445fbb361df451ef055 /sys/i386/include/cpufunc.h | |
| parent | c9f24c9fd2c2e8be3133555fca3de9a9ddd4ab21 (diff) | |
| download | FreeBSD-src-e771ecca0f52de0eb9e330af62ef2a6685ff7bc6.zip FreeBSD-src-e771ecca0f52de0eb9e330af62ef2a6685ff7bc6.tar.gz | |
General cleanup of the sub-system locking macros.
Eliminated the RECURSIVE_MPINTRLOCK.
clock.c and microtime use clock_lock.
sio.c and cy.c use com_lock.
Suggestions by: Bruce Evans <bde@zeta.org.au>
Diffstat (limited to 'sys/i386/include/cpufunc.h')
| -rw-r--r-- | sys/i386/include/cpufunc.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 9fd475e..df987bd 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.69 1997/07/17 04:33:46 dyson Exp $ + * $Id: cpufunc.h,v 1.2 1997/09/01 07:37:58 smp Exp smp $ */ /* @@ -58,13 +58,17 @@ static __inline void disable_intr(void) { __asm __volatile("cli" : : : "memory"); - MPINTR_LOCK(); +#ifdef SMP + s_lock(&mpintr_lock); +#endif } static __inline void enable_intr(void) { - MPINTR_UNLOCK(); +#ifdef SMP + s_unlock(&mpintr_lock); +#endif __asm __volatile("sti"); } |
