diff options
| author | ps <ps@FreeBSD.org> | 2000-09-22 23:40:10 +0000 |
|---|---|---|
| committer | ps <ps@FreeBSD.org> | 2000-09-22 23:40:10 +0000 |
| commit | ab88cc6719e2d569d7f78bc2fdf7925513a538c8 (patch) | |
| tree | 076030806da9ece11ea86aef58f1ac0c4fdd36c0 /sys/conf | |
| parent | 9b419172b9371a7c431182f07664221bdc4cf735 (diff) | |
| download | FreeBSD-src-ab88cc6719e2d569d7f78bc2fdf7925513a538c8.zip FreeBSD-src-ab88cc6719e2d569d7f78bc2fdf7925513a538c8.tar.gz | |
Remove the NCPU, NAPIC, NBUS, NINTR config options. Make NAPIC,
NBUS, NINTR dynamic and set NCPU to a maximum of 16 under SMP.
Reviewed by: peter
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 10 | ||||
| -rw-r--r-- | sys/conf/options | 2 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c2b94ab..4909bca 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -105,10 +105,6 @@ options ROOTDEVNAME=\"ufs:da0s2e\" # # SMP enables building of a Symmetric MultiProcessor Kernel. # APIC_IO enables the use of the IO APIC for Symmetric I/O. -# NCPU sets the number of CPUs, defaults to 2. -# NBUS sets the number of busses, defaults to 8. -# NAPIC sets the number of IO APICs on the motherboard, defaults to 1. -# NINTR sets the total number of INTs provided by the motherboard. # # Notes: # @@ -124,12 +120,6 @@ options ROOTDEVNAME=\"ufs:da0s2e\" options SMP # Symmetric MultiProcessor Kernel options APIC_IO # Symmetric (APIC) I/O -# Optional, these are the defaults plus 1: -options NCPU=5 # number of CPUs -options NBUS=10 # number of busses -options NAPIC=2 # number of IO APICs -options NINTR=25 # number of INTs - # # Rogue SMP hardware: # diff --git a/sys/conf/options b/sys/conf/options index 3c78eeb..80327a8 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -367,8 +367,6 @@ PQ_CACHESIZE opt_vmpage.h # Standard SMP options SMP opt_global.h -NCPU opt_smp.h -NBUS opt_smp.h # sys/netkey KEY diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 4cceb8b..d5d0f65 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -33,8 +33,6 @@ DEBUG_SVR4 opt_svr4.h # i386 SMP options APIC_IO opt_global.h -NAPIC opt_smp.h -NINTR opt_smp.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h |
