diff options
| author | markj <markj@FreeBSD.org> | 2015-09-11 03:24:07 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-09-11 03:24:07 +0000 |
| commit | dfb0cc5c03efdfd24efc1469b804742fd2d9bc5d (patch) | |
| tree | 11760d447b62e31159f31afdca3fc3efbac38fae /sys/conf | |
| parent | 3ff7032ecdcf849960103d5e02a6ff33abfed3ce (diff) | |
| download | FreeBSD-src-dfb0cc5c03efdfd24efc1469b804742fd2d9bc5d.zip FreeBSD-src-dfb0cc5c03efdfd24efc1469b804742fd2d9bc5d.tar.gz | |
Merge stack(9) implementations for i386 and amd64 under x86/.
Reviewed by: jhb, kib
Sponsored by: EMC / Isilon Storage Division
Differential Revision: https://reviews.freebsd.org/D3255
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 bd70825..3def78f 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -130,7 +130,6 @@ amd64/amd64/pmap.c standard amd64/amd64/prof_machdep.c optional profiling-routine amd64/amd64/ptrace_machdep.c standard amd64/amd64/sigtramp.S standard -amd64/amd64/stack_machdep.c optional ddb | stack amd64/amd64/support.S standard amd64/amd64/sys_machdep.c standard amd64/amd64/trap.c standard @@ -612,6 +611,7 @@ x86/x86/mp_x86.c optional smp x86/x86/msi.c optional pci x86/x86/nexus.c standard x86/x86/pvclock.c standard +x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index aed5b9d..1fae3a5 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -476,7 +476,6 @@ i386/i386/mpboot.s optional smp i386/i386/perfmon.c optional perfmon i386/i386/pmap.c standard i386/i386/ptrace_machdep.c standard -i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard @@ -603,6 +602,7 @@ x86/x86/mptable_pci.c optional apic pci x86/x86/mp_x86.c optional smp x86/x86/msi.c optional apic pci x86/x86/nexus.c standard +x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/pvclock.c standard x86/x86/delay.c standard diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 28a94a8..ee6cf71 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -174,7 +174,6 @@ i386/i386/mpboot.s optional smp i386/i386/perfmon.c optional perfmon i386/i386/pmap.c standard i386/i386/ptrace_machdep.c standard -i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard @@ -274,5 +273,6 @@ 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 +x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/delay.c standard |
