diff options
| author | jhb <jhb@FreeBSD.org> | 2014-12-22 18:40:59 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-12-22 18:40:59 +0000 |
| commit | 2b345a08edde7a77b1eccf22395f90aec2d3adac (patch) | |
| tree | 5f2d43eeb579a85a28f1b992988680726e8b93dc /sys/conf | |
| parent | 9a4e55b14723d5cd0147c18c4a4fde418c5086f8 (diff) | |
| download | FreeBSD-src-2b345a08edde7a77b1eccf22395f90aec2d3adac.zip FreeBSD-src-2b345a08edde7a77b1eccf22395f90aec2d3adac.tar.gz | |
MFC 260557,271076,271077,271082,271083,271098:
- Remove spaces from boot messages when we print the CPU ID/Family/Stepping
- Move prototypes for various functions into out of C files and into
<machine/md_var.h>.
- Reduce diffs between i386 and amd64 initcpu.c and identcpu.c files.
- Move blacklists of broken TSCs out of the printcpuinfo() function
and into the TSC probe routine.
- Merge the amd64 and i386 identcpu.c into a single x86 implementation.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/files.pc98 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 4f7272d..2c94300 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -114,7 +114,6 @@ amd64/amd64/elf_machdep.c standard amd64/amd64/exception.S standard amd64/amd64/fpu.c standard amd64/amd64/gdb_machdep.c optional gdb -amd64/amd64/identcpu.c standard amd64/amd64/in_cksum.c optional inet | inet6 amd64/amd64/initcpu.c standard amd64/amd64/io.c optional io @@ -578,6 +577,7 @@ x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/fdt_machdep.c optional fdt +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c standard x86/x86/legacy.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index d6cd350..0ba06ef 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -460,7 +460,6 @@ i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem -i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -594,6 +593,7 @@ x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/fdt_machdep.c optional fdt +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c optional native diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 509a04a..ee2ee16 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -143,7 +143,6 @@ i386/i386/elf_machdep.c standard i386/i386/exception.s standard i386/i386/gdb_machdep.c optional gdb i386/i386/i686_mem.c optional mem -i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -251,6 +250,7 @@ x86/pci/pci_bus.c optional pci x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c standard |
