diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2017-10-31 11:44:35 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2017-10-31 11:44:35 -0700 |
| commit | f4861c48b88ff145cc8b50655b61d6c6a411f073 (patch) | |
| tree | 1808924202f28fb4da4cad16fc7873cf2650e0a5 | |
| parent | 26ce06bb9f84316d4210bed00699be00fb320cca (diff) | |
| download | kernel-f4861c48b88ff145cc8b50655b61d6c6a411f073.tar.gz kernel-f4861c48b88ff145cc8b50655b61d6c6a411f073.tar.xz kernel-f4861c48b88ff145cc8b50655b61d6c6a411f073.zip | |
Stop setting CONFIG_MAXSMP and adjust NR_CPUS
During the Kconfig factor, CONFIG_MAXSMP was set for all builds instead
of just debug builds. This bumps the NR_CPUs up to 8192 which is far
more than anyone actually needs for Fedora. Stop setting CONFIG_MAXSMP
on non-debug configs and adjust NR_CPUs back to what it was before.
| -rw-r--r-- | baseconfig/x86/CONFIG_MAXSMP | 2 | ||||
| -rw-r--r-- | baseconfig/x86/x86_64/CONFIG_NR_CPUS | 2 | ||||
| -rw-r--r-- | config_generation | 2 | ||||
| -rw-r--r-- | debugconfig/x86/x86_64/CONFIG_NR_CPUS | 1 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 4 |
7 files changed, 8 insertions, 7 deletions
diff --git a/baseconfig/x86/CONFIG_MAXSMP b/baseconfig/x86/CONFIG_MAXSMP index 8d0fa581d..d0d71de53 100644 --- a/baseconfig/x86/CONFIG_MAXSMP +++ b/baseconfig/x86/CONFIG_MAXSMP @@ -1 +1 @@ -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set diff --git a/baseconfig/x86/x86_64/CONFIG_NR_CPUS b/baseconfig/x86/x86_64/CONFIG_NR_CPUS index 441191641..27d187f4d 100644 --- a/baseconfig/x86/x86_64/CONFIG_NR_CPUS +++ b/baseconfig/x86/x86_64/CONFIG_NR_CPUS @@ -1 +1 @@ -CONFIG_NR_CPUS=8192 +CONFIG_NR_CPUS=1024 diff --git a/config_generation b/config_generation index 6708b1022..64ae444f4 100644 --- a/config_generation +++ b/config_generation @@ -5,7 +5,7 @@ # x86_64 x86_64=baseconfig:baseconfig-x86:baseconfig-x86-x86_64 -x86_64-debug=baseconfig:baseconfig-x86:baseconfig-x86-x86_64:debugconfig:debugconfig-x86 +x86_64-debug=baseconfig:baseconfig-x86:baseconfig-x86-x86_64:debugconfig:debugconfig-x86:debugconfig-x86-x86_64 # i686 i686=baseconfig:baseconfig-x86:baseconfig-x86-i686 diff --git a/debugconfig/x86/x86_64/CONFIG_NR_CPUS b/debugconfig/x86/x86_64/CONFIG_NR_CPUS new file mode 100644 index 000000000..441191641 --- /dev/null +++ b/debugconfig/x86/x86_64/CONFIG_NR_CPUS @@ -0,0 +1 @@ +CONFIG_NR_CPUS=8192 diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index c0d237f43..6ad2a0c33 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2775,7 +2775,7 @@ CONFIG_MAX30100=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAX_RAW_DEVS=8192 -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set # CONFIG_MCE_AMD_INJ is not set diff --git a/kernel-i686.config b/kernel-i686.config index dcfa25f71..25361bf95 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2775,7 +2775,7 @@ CONFIG_MAX30100=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAX_RAW_DEVS=8192 -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set # CONFIG_MCE_AMD_INJ is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 70eef4e26..c353bc4cb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2824,7 +2824,7 @@ CONFIG_MAX30100=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAX_RAW_DEVS=8192 -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set # CONFIG_MCE_AMD_INJ is not set @@ -3739,7 +3739,7 @@ CONFIG_NORTEL_HERMES=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m -CONFIG_NR_CPUS=8192 +CONFIG_NR_CPUS=1024 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m |