From ed47777d0567cd5bf98f5b210d770eeb86aeba1e Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Fri, 20 Oct 2000 07:31:00 +0000
Subject: - machine/mutex.h -> sys/mutex.h - machine/ipl.h -> sys/ipl.h - Use
 MUTEX_DECLARE() for clock_lock

---
 sys/i386/isa/clock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/i386/isa/clock.c')

diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index a164288..3971cf5 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -54,6 +54,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/ipl.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
@@ -69,10 +71,8 @@
 #endif
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/ipl.h>
 #include <machine/limits.h>
 #include <machine/md_var.h>
-#include <machine/mutex.h>
 #include <machine/psl.h>
 #ifdef APIC_IO
 #include <machine/segments.h>
@@ -140,7 +140,7 @@ int	timer0_max_count;
 u_int	tsc_freq;
 int	tsc_is_broken;
 int	wall_cmos_clock;	/* wall CMOS clock assumed if != 0 */
-struct	mtx clock_lock;
+MUTEX_DECLARE(,clock_lock);
 
 static	int	beeping = 0;
 static	const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31};
-- 
cgit v1.1