diff options
| author | kato <kato@FreeBSD.org> | 1997-11-19 11:35:22 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-11-19 11:35:22 +0000 |
| commit | 6f23e076180b20e5f4846ef1ed4b42b00b28259b (patch) | |
| tree | 5659767ba70bbc94add70b587e2231f00bd8a34e /sys | |
| parent | 97136206e7c235d71ede7a43040e1de9a1cd2bfa (diff) | |
| download | FreeBSD-src-6f23e076180b20e5f4846ef1ed4b42b00b28259b.zip FreeBSD-src-6f23e076180b20e5f4846ef1ed4b42b00b28259b.tar.gz | |
Synchronize with sys/i386/isa/clock.c revision 1.104.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 7 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 7 | ||||
| -rw-r--r-- | sys/pc98/pc98/clock.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 1c9bf8b..8a08fc9 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $ + * $Id: clock.c,v 1.36 1997/10/28 14:30:46 kato Exp $ */ /* @@ -53,12 +53,14 @@ */ #include "opt_clock.h" -#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/time.h> #include <sys/kernel.h> +#ifndef SMP +#include <sys/lock.h> +#endif #include <sys/sysctl.h> #include <machine/clock.h> @@ -87,7 +89,6 @@ #endif #include <i386/isa/timerreg.h> -#include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef SMP diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 1c9bf8b..8a08fc9 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $ + * $Id: clock.c,v 1.36 1997/10/28 14:30:46 kato Exp $ */ /* @@ -53,12 +53,14 @@ */ #include "opt_clock.h" -#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/time.h> #include <sys/kernel.h> +#ifndef SMP +#include <sys/lock.h> +#endif #include <sys/sysctl.h> #include <machine/clock.h> @@ -87,7 +89,6 @@ #endif #include <i386/isa/timerreg.h> -#include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef SMP diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index 1c9bf8b..8a08fc9 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $ + * $Id: clock.c,v 1.36 1997/10/28 14:30:46 kato Exp $ */ /* @@ -53,12 +53,14 @@ */ #include "opt_clock.h" -#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/time.h> #include <sys/kernel.h> +#ifndef SMP +#include <sys/lock.h> +#endif #include <sys/sysctl.h> #include <machine/clock.h> @@ -87,7 +89,6 @@ #endif #include <i386/isa/timerreg.h> -#include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef SMP |
