summaryrefslogtreecommitdiffstats
path: root/sys/pc98/cbus/clock.c
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>2000-10-20 10:19:40 +0000
committerkato <kato@FreeBSD.org>2000-10-20 10:19:40 +0000
commit7ac0a58b2cc7b7de001c3223d492c0eccd9cec81 (patch)
treeaede6aa64c95f7763cb41f84cf62e5dda4086c3a /sys/pc98/cbus/clock.c
parent72eed4a0dc683cb9e15b08e8ea2f3c2875696259 (diff)
downloadFreeBSD-src-7ac0a58b2cc7b7de001c3223d492c0eccd9cec81.zip
FreeBSD-src-7ac0a58b2cc7b7de001c3223d492c0eccd9cec81.tar.gz
Merged from sys/i386/isa/clock.c revision 1.160.
Diffstat (limited to 'sys/pc98/cbus/clock.c')
-rw-r--r--sys/pc98/cbus/clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 90a31e6..3cbf693 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -58,6 +58,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>
@@ -73,10 +75,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>
@@ -154,7 +154,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};
OpenPOWER on IntegriCloud