]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
powerpc: Define NR_CPUS all the time
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Fri, 7 May 2021 09:24:43 +0000 (09:24 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 May 2021 05:27:16 +0000 (15:27 +1000)
include/linux/threads.h defines a default value for CONFIG_NR_CPUS
but suggests the architectures should always define it.

So do it, when CONFIG_SMP is not selected set CONFIG_NR_CPUS to 1.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/afef0ec65a8ba8651bf4f6e4f4f08a8b6991dbfb.1620379469.git.christophe.leroy@csgroup.eu
arch/powerpc/platforms/Kconfig.cputype

index f998e655b5706c8511e02f15deda0d4f26dba06d..885140055b7aa6160664e35e2ccd56a888a34583 100644 (file)
@@ -476,9 +476,9 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-8192)"
-       range 2 8192
-       depends on SMP
+       int "Maximum number of CPUs (2-8192)" if SMP
+       range 2 8192 if SMP
+       default "1" if !SMP
        default "32" if PPC64
        default "4"