diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-07-11 14:21:20 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-07-11 16:22:22 +0800 |
commit | 2120557722577d8cff75a33a799ad15582dbd8ef (patch) | |
tree | 2518d0dd3038f52cc9d4a26200594132e115f829 /arch/sparc/Kconfig | |
parent | afd012a6a05f426411186b5ed23c99bb0d83cbe7 (diff) | |
parent | 03a929fbcbb1f7dca3cca19eefcbc15ecc191331 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlinux-linaro-lsk-v4.4-android-test
Conflicts:
arch/arm64/kernel/armv8_deprecated.c
arch/arm64/kernel/efi.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/head.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/mm/mmu.c
include/linux/memblock.h
mm/memblock.c
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 3736be630113..894bcaed002e 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -183,9 +183,9 @@ config NR_CPUS int "Maximum number of CPUs" depends on SMP range 2 32 if SPARC32 - range 2 1024 if SPARC64 + range 2 4096 if SPARC64 default 32 if SPARC32 - default 64 if SPARC64 + default 4096 if SPARC64 source kernel/Kconfig.hz |