diff options
| author | jhb <jhb@FreeBSD.org> | 2000-10-20 07:31:00 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-10-20 07:31:00 +0000 |
| commit | ed47777d0567cd5bf98f5b210d770eeb86aeba1e (patch) | |
| tree | a1e07e494e2db5d976d3f09cbe08133625a2238f | |
| parent | 3619515ec0740027d700bb65184daa60c07258a9 (diff) | |
| download | FreeBSD-src-ed47777d0567cd5bf98f5b210d770eeb86aeba1e.zip FreeBSD-src-ed47777d0567cd5bf98f5b210d770eeb86aeba1e.tar.gz | |
- machine/mutex.h -> sys/mutex.h
- machine/ipl.h -> sys/ipl.h
- Use MUTEX_DECLARE() for clock_lock
| -rw-r--r-- | sys/amd64/amd64/tsc.c | 6 | ||||
| -rw-r--r-- | sys/amd64/isa/clock.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/tsc.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/clock.c | 6 | ||||
| -rw-r--r-- | sys/isa/atrtc.c | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index a164288..3971cf5 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.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}; diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index a164288..3971cf5 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/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}; diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index a164288..3971cf5 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.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}; 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}; diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index a164288..3971cf5 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.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}; |
