diff options
| author | dim <dim@FreeBSD.org> | 2015-09-11 17:20:03 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-11 17:20:03 +0000 |
| commit | 5cc32d7f18f18fb3a5f4155b7f748cc7be60d2da (patch) | |
| tree | 09add9017de3c98451b1eaf85a24b608cf228e4b /sys/conf | |
| parent | a8fd1565ce9f3593ba962863828175715c3dede0 (diff) | |
| parent | 2a0c9817c795eaf2bf7607d8cc9b36975aaca160 (diff) | |
| download | FreeBSD-src-5cc32d7f18f18fb3a5f4155b7f748cc7be60d2da.zip FreeBSD-src-5cc32d7f18f18fb3a5f4155b7f748cc7be60d2da.tar.gz | |
Merge ^/head r287527 through r287679.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 1 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/files.pc98 | 2 | ||||
| -rw-r--r-- | sys/conf/options | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/sys/conf/files b/sys/conf/files index 280f6a6..df8233f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -85,6 +85,7 @@ cam/ctl/ctl_frontend.c optional ctl cam/ctl/ctl_frontend_cam_sim.c optional ctl cam/ctl/ctl_frontend_ioctl.c optional ctl cam/ctl/ctl_frontend_iscsi.c optional ctl +cam/ctl/ctl_ha.c optional ctl cam/ctl/ctl_scsi_all.c optional ctl cam/ctl/ctl_tpc.c optional ctl cam/ctl/ctl_tpc_local.c optional ctl 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 diff --git a/sys/conf/options b/sys/conf/options index 936abc9..ccbbd80 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -947,11 +947,11 @@ RCTL opt_global.h # Random number generator(s) # Which CSPRNG hash we get. # If Yarrow is not chosen, Fortuna is selected. -RANDOM_YARROW opt_random.h +RANDOM_YARROW opt_global.h # With this, no entropy processor is loaded, but the entropy # harvesting infrastructure is present. This means an entropy # processor may be loaded as a module. -RANDOM_LOADABLE opt_random.h +RANDOM_LOADABLE opt_global.h # This turns on high-rate and potentially expensive harvesting in # the uma slab allocator. RANDOM_ENABLE_UMA opt_global.h |
