diff options
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/amd64-gdbstub.c | 3 | ||||
-rw-r--r-- | sys/amd64/amd64/autoconf.c | 4 | ||||
-rw-r--r-- | sys/amd64/amd64/db_interface.c | 4 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 4 | ||||
-rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 5 | ||||
-rw-r--r-- | sys/amd64/amd64/mptable.c | 5 | ||||
-rw-r--r-- | sys/amd64/amd64/tsc.c | 4 | ||||
-rw-r--r-- | sys/amd64/include/mptable.h | 5 | ||||
-rw-r--r-- | sys/amd64/isa/clock.c | 4 |
9 files changed, 17 insertions, 21 deletions
diff --git a/sys/amd64/amd64/amd64-gdbstub.c b/sys/amd64/amd64/amd64-gdbstub.c index 40530bf..a2323ce 100644 --- a/sys/amd64/amd64/amd64-gdbstub.c +++ b/sys/amd64/amd64/amd64-gdbstub.c @@ -95,8 +95,7 @@ #include <sys/param.h> #include <sys/reboot.h> #include <sys/systm.h> - -#include <machine/cons.h> +#include <sys/cons.h> #include <ddb/ddb.h> diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 6e2b68a..ea12b1a 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.129 1999/07/17 20:47:49 phk Exp $ + * $Id: autoconf.c,v 1.130 1999/08/06 20:29:46 phk Exp $ */ /* @@ -63,9 +63,9 @@ #include <sys/malloc.h> #include <sys/mount.h> #include <sys/sysctl.h> +#include <sys/cons.h> #include <machine/bootinfo.h> -#include <machine/cons.h> #include <machine/ipl.h> #include <machine/md_var.h> #ifdef APIC_IO diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c index 2998597..0ad6dfb 100644 --- a/sys/amd64/amd64/db_interface.c +++ b/sys/amd64/amd64/db_interface.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_interface.c,v 1.43 1998/12/28 23:02:56 msmith Exp $ + * $Id: db_interface.c,v 1.44 1999/04/28 01:03:17 luoqi Exp $ */ /* @@ -32,8 +32,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/reboot.h> +#include <sys/cons.h> -#include <machine/cons.h> #include <machine/cpu.h> #ifdef SMP #include <machine/smp.h> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index c0dc2eb..a74c108 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.356 1999/07/19 23:36:30 peter Exp $ + * $Id: machdep.c,v 1.357 1999/07/29 01:49:18 msmith Exp $ */ #include "apm.h" @@ -97,6 +97,7 @@ #include <sys/user.h> #include <sys/exec.h> +#include <sys/cons.h> #include <ddb/ddb.h> @@ -106,7 +107,6 @@ #include <machine/reg.h> #include <machine/clock.h> #include <machine/specialreg.h> -#include <machine/cons.h> #include <machine/bootinfo.h> #include <machine/ipl.h> #include <machine/md_var.h> diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index e81efef..969cd08 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.105 1999/06/23 23:02:38 msmith Exp $ + * $Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $ */ #include "opt_smp.h" @@ -45,6 +45,7 @@ #ifdef BETTER_CLOCK #include <sys/dkstat.h> #endif +#include <sys/cons.h> /* cngetc() */ #include <vm/vm.h> #include <vm/vm_param.h> @@ -73,8 +74,6 @@ #include <machine/cputypes.h> #include <machine/globaldata.h> -#include <i386/i386/cons.h> /* cngetc() */ - #if defined(APIC_IO) #include <machine/md_var.h> /* setidt() */ #include <i386/isa/icu.h> /* IPIs */ diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index e81efef..969cd08 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.105 1999/06/23 23:02:38 msmith Exp $ + * $Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $ */ #include "opt_smp.h" @@ -45,6 +45,7 @@ #ifdef BETTER_CLOCK #include <sys/dkstat.h> #endif +#include <sys/cons.h> /* cngetc() */ #include <vm/vm.h> #include <vm/vm_param.h> @@ -73,8 +74,6 @@ #include <machine/cputypes.h> #include <machine/globaldata.h> -#include <i386/i386/cons.h> /* cngetc() */ - #if defined(APIC_IO) #include <machine/md_var.h> /* setidt() */ #include <i386/isa/icu.h> /* IPIs */ diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 1c8d8f6..188e20b 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.141 1999/07/28 20:22:30 msmith Exp $ + * $Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $ */ /* @@ -59,10 +59,10 @@ #include <sys/lock.h> #endif #include <sys/sysctl.h> +#include <sys/cons.h> #include <machine/clock.h> #ifdef CLK_CALIBRATION_LOOP -#include <machine/cons.h> #endif #include <machine/cputypes.h> #include <machine/frame.h> diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index e81efef..969cd08 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.105 1999/06/23 23:02:38 msmith Exp $ + * $Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $ */ #include "opt_smp.h" @@ -45,6 +45,7 @@ #ifdef BETTER_CLOCK #include <sys/dkstat.h> #endif +#include <sys/cons.h> /* cngetc() */ #include <vm/vm.h> #include <vm/vm_param.h> @@ -73,8 +74,6 @@ #include <machine/cputypes.h> #include <machine/globaldata.h> -#include <i386/i386/cons.h> /* cngetc() */ - #if defined(APIC_IO) #include <machine/md_var.h> /* setidt() */ #include <i386/isa/icu.h> /* IPIs */ diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 1c8d8f6..188e20b 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.141 1999/07/28 20:22:30 msmith Exp $ + * $Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $ */ /* @@ -59,10 +59,10 @@ #include <sys/lock.h> #endif #include <sys/sysctl.h> +#include <sys/cons.h> #include <machine/clock.h> #ifdef CLK_CALIBRATION_LOOP -#include <machine/cons.h> #endif #include <machine/cputypes.h> #include <machine/frame.h> |