Unverified Commit c09908f0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4044 Set CONFIG_NODES_SHIFT to 8 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3XPKB2I2K4VWGH4W4BP4JO5WGKQYZEYE/ 
Patch[1] allow to set NODES_SHIFT between 8 and 10 on MAXSMP.
Patch[2] set NODES_SHIFT to 8 for both x86_64 and ARM64 defconfig.

Liu Shixin (2):
  x86/Kconfig: allow NODES_SHIFT to be set on MAXSMP
  openeuler_defconfig: set CONFIG_NODES_SHIFT to 8 for both x86_64/ARM64


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I8UT5S 
 
Link:https://gitee.com/openeuler/kernel/pulls/4044

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents f113c61e e41e2059

arch/arm64/configs/openeuler_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ CONFIG_NR_CPUS=4096 
CONFIG_HOTPLUG_CPU=y

# CONFIG_ARM64_BOOTPARAM_HOTPLUG_CPU0 is not set

CONFIG_NUMA=y

CONFIG_NODES_SHIFT=7

CONFIG_NODES_SHIFT=8

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_300 is not set

arch/x86/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1626,7 +1626,8 @@ config NUMA_EMU 
	  number of nodes. This is only useful for debugging.



config NODES_SHIFT

	int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP

	int "Maximum NUMA Nodes (as a power of 2)"

	range 8 10 if MAXSMP

	range 1 10

	default "10" if MAXSMP

	default "6" if X86_64

arch/x86/configs/openeuler_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ CONFIG_NUMA_AWARE_SPINLOCKS=y 
CONFIG_AMD_NUMA=y

CONFIG_X86_64_ACPI_NUMA=y

CONFIG_NUMA_EMU=y

CONFIG_NODES_SHIFT=10

CONFIG_NODES_SHIFT=8

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_DEFAULT=y

# CONFIG_ARCH_MEMORY_PROBE is not set