diff options
| author | bde <bde@FreeBSD.org> | 1996-10-10 10:25:26 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-10-10 10:25:26 +0000 |
| commit | 81a40401a62cc121ae32e81467b6ebbc527aecd9 (patch) | |
| tree | 70fcb90858348c063c858323b21a4f4a8b1176a2 | |
| parent | 40b52cd1e5dccacf09e05011ee072edc2348967d (diff) | |
| download | FreeBSD-src-81a40401a62cc121ae32e81467b6ebbc527aecd9.zip FreeBSD-src-81a40401a62cc121ae32e81467b6ebbc527aecd9.tar.gz | |
Don't include "opt_cpu.h" in <machine/clock.h>, since this breaks lkm's.
The change breaks kern_clock.c; fix that temporarily by including
"opt_cpu.h" there.
| -rw-r--r-- | sys/amd64/include/clock.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/clock.h | 4 | ||||
| -rw-r--r-- | sys/kern/kern_clock.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_tc.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_timeout.c | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index d9a1993..a923dda 100644 --- a/sys/amd64/include/clock.h +++ b/sys/amd64/include/clock.h @@ -3,14 +3,12 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $Id: clock.h,v 1.16 1996/08/02 21:16:13 bde Exp $ + * $Id: clock.h,v 1.17 1996/10/09 19:47:26 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#include "opt_cpu.h" - #if defined(I586_CPU) || defined(I686_CPU) /* diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index d9a1993..a923dda 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -3,14 +3,12 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $Id: clock.h,v 1.16 1996/08/02 21:16:13 bde Exp $ + * $Id: clock.h,v 1.17 1996/10/09 19:47:26 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#include "opt_cpu.h" - #if defined(I586_CPU) || defined(I686_CPU) /* diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index e8f9066..d94d53e 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.25 1996/06/23 17:40:42 bde Exp $ + * $Id: kern_clock.c,v 1.26 1996/07/30 16:59:22 bde Exp $ */ /* Portions of this software are covered by the following: */ @@ -56,6 +56,8 @@ * * *****************************************************************************/ +#include "opt_cpu.h" /* XXX */ + #include <sys/param.h> #include <sys/systm.h> #include <sys/dkstat.h> diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index e8f9066..d94d53e 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.25 1996/06/23 17:40:42 bde Exp $ + * $Id: kern_clock.c,v 1.26 1996/07/30 16:59:22 bde Exp $ */ /* Portions of this software are covered by the following: */ @@ -56,6 +56,8 @@ * * *****************************************************************************/ +#include "opt_cpu.h" /* XXX */ + #include <sys/param.h> #include <sys/systm.h> #include <sys/dkstat.h> diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index e8f9066..d94d53e 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.25 1996/06/23 17:40:42 bde Exp $ + * $Id: kern_clock.c,v 1.26 1996/07/30 16:59:22 bde Exp $ */ /* Portions of this software are covered by the following: */ @@ -56,6 +56,8 @@ * * *****************************************************************************/ +#include "opt_cpu.h" /* XXX */ + #include <sys/param.h> #include <sys/systm.h> #include <sys/dkstat.h> |
