diff options
| author | attilio <attilio@FreeBSD.org> | 2010-10-28 16:31:39 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2010-10-28 16:31:39 +0000 |
| commit | 7ab661360c2131496bd3c111b5b3b2462fe3d2be (patch) | |
| tree | 87264417ede373f72270a7c8652202b1b7960154 /sys/conf | |
| parent | 3f3b4d105fe6c50c3a1b03e2ba454374588f6c5f (diff) | |
| download | FreeBSD-src-7ab661360c2131496bd3c111b5b3b2462fe3d2be.zip FreeBSD-src-7ab661360c2131496bd3c111b5b3b2462fe3d2be.tar.gz | |
Merge nexus.c from amd64 and i386 to x86 subtree.
Sponsored by: Sandvine Incorporated
Tested by: gianni
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 95b6e28..fb4bc2f 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -121,7 +121,6 @@ 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/nexus.c standard amd64/amd64/pmap.c standard amd64/amd64/prof_machdep.c optional profiling-routine amd64/amd64/sigtramp.S standard @@ -325,3 +324,4 @@ x86/x86/mca.c standard x86/x86/mptable.c optional mptable x86/x86/mptable_pci.c optional mptable pci x86/x86/msi.c optional pci +x86/x86/nexus.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index e83f273..cb05bec 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -290,7 +290,6 @@ i386/xen/mp_machdep.c optional xen smp i386/i386/mp_watchdog.c optional mp_watchdog smp i386/i386/mpboot.s optional smp native i386/xen/mptable.c optional apic xen -i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon i386/i386/pmap.c optional native i386/xen/pmap.c optional xen @@ -399,3 +398,4 @@ x86/x86/mca.c standard x86/x86/mptable.c optional apic native x86/x86/mptable_pci.c optional apic pci x86/x86/msi.c optional apic pci +x86/x86/nexus.c standard diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 04cbe97..ab88e22 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -156,7 +156,6 @@ 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/nexus.c standard i386/i386/perfmon.c optional perfmon i386/i386/pmap.c standard i386/i386/ptrace_machdep.c standard @@ -259,3 +258,4 @@ x86/x86/mca.c standard x86/x86/mptable.c optional apic x86/x86/mptable_pci.c optional apic pci x86/x86/msi.c optional apic pci +x86/x86/nexus.c standard |
