diff options
| author | kib <kib@FreeBSD.org> | 2016-08-10 13:38:44 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-08-10 13:38:44 +0000 |
| commit | 07ec603345f0b3b30361e97f3cad922a9b16cd87 (patch) | |
| tree | 7066b37880a58e6d471b00069123a15c78a80e9a /sys/conf | |
| parent | f7cd61fd18e412fe2e0c650f306650e4bf9757c1 (diff) | |
| download | FreeBSD-src-07ec603345f0b3b30361e97f3cad922a9b16cd87.zip FreeBSD-src-07ec603345f0b3b30361e97f3cad922a9b16cd87.tar.gz | |
MFC r303712:
Merge i386 and amd64 variants of mp_watchdog.c into x86/.
Approved by: re (gjb)
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 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ffe8b65..e3cd00d 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -123,7 +123,6 @@ amd64/amd64/machdep.c standard amd64/amd64/mem.c optional mem amd64/amd64/minidump_machdep.c standard amd64/amd64/mp_machdep.c optional smp -amd64/amd64/mp_watchdog.c optional mp_watchdog smp amd64/amd64/mpboot.S optional smp amd64/amd64/pmap.c standard amd64/amd64/prof_machdep.c optional profiling-routine @@ -619,6 +618,7 @@ x86/x86/mca.c standard x86/x86/mptable.c optional mptable x86/x86/mptable_pci.c optional mptable pci x86/x86/mp_x86.c optional smp +x86/x86/mp_watchdog.c optional mp_watchdog smp x86/x86/msi.c optional pci x86/x86/nexus.c standard x86/x86/pvclock.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index ac65941..bf6f1f0 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -479,7 +479,6 @@ i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp i386/i386/mp_machdep.c optional smp -i386/i386/mp_watchdog.c optional mp_watchdog smp i386/i386/mpboot.s optional smp i386/i386/perfmon.c optional perfmon i386/i386/pmap.c standard @@ -610,6 +609,7 @@ x86/x86/mca.c standard x86/x86/mptable.c optional apic x86/x86/mptable_pci.c optional apic pci x86/x86/mp_x86.c optional smp +x86/x86/mp_watchdog.c optional mp_watchdog smp x86/x86/msi.c optional apic pci x86/x86/nexus.c standard x86/x86/stack_machdep.c optional ddb | stack diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index ecb3d4a..8a7dc98 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -168,7 +168,6 @@ i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp i386/i386/mp_machdep.c optional smp -i386/i386/mp_watchdog.c optional mp_watchdog smp i386/i386/mpboot.s optional smp i386/i386/perfmon.c optional perfmon i386/i386/pmap.c standard @@ -269,9 +268,10 @@ x86/x86/io_apic.c optional apic x86/x86/legacy.c standard x86/x86/local_apic.c optional apic x86/x86/mca.c standard -x86/x86/mp_x86.c optional smp x86/x86/mptable.c optional apic x86/x86/mptable_pci.c optional apic pci +x86/x86/mp_x86.c optional smp +x86/x86/mp_watchdog.c optional mp_watchdog smp x86/x86/msi.c optional apic pci x86/x86/nexus.c standard x86/x86/stack_machdep.c optional ddb | stack |
