diff options
| author | Renato Botelho <renato@netgate.com> | 2017-07-03 16:41:30 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-07-03 16:41:30 -0300 |
| commit | b91e8edec6ef973706ceba5985379a0aded6a5aa (patch) | |
| tree | 92c1d3976fd61f447f3e62225141c02b6ef4c320 /sys/amd64/conf | |
| parent | 5fa580e9c45b6668f134701651fa17cad722750e (diff) | |
| parent | ff3a058c4f832f66c1a779cf9bd05f758ad411d8 (diff) | |
| download | FreeBSD-src-b91e8edec6ef973706ceba5985379a0aded6a5aa.zip FreeBSD-src-b91e8edec6ef973706ceba5985379a0aded6a5aa.tar.gz | |
Merge remote-tracking branch 'origin/releng/11.1' into RELENG_2_5
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/amd64/conf/MINIMAL | 1 | ||||
| -rw-r--r-- | sys/amd64/conf/NOTES | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 6f68eb3..de7cbe6 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -85,6 +85,7 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel options DEVICE_NUMA # I/O Device Affinity +options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 2caf958..7e7b037 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -93,6 +93,7 @@ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel options DEVICE_NUMA # I/O Device Affinity +options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index a7095e3..64be12a 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -341,6 +341,7 @@ device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. device iwn # Intel 4965/1000/5000/6000 wireless NICs. device ixl # Intel XL710 40Gbe PCIE Ethernet +options IXL_IW # Enable iWARP Client Interface in ixl(4) device ixlv # Intel XL710 40Gbe VF PCIE Ethernet device mlx4ib # Mellanox ConnectX HCA InfiniBand device mlxen # Mellanox ConnectX HCA Ethernet |
