numa.scc is generic and numa_x86_64.scc is specific to x86_64. meta/recipes-kernel/linux/linux-yocto.inc in openembedded-core needs to be adapted to enable numa_x86_64.scc on x86_64.
The x86_64 specific config options get effectively disabled on other archs and cause warnings from merge_config.sh. Signed-off-by: Mikko Rapeli <[email protected]> --- features/numa/numa.cfg | 1 - features/numa/numa_x86_64.cfg | 2 ++ features/numa/numa_x86_64.scc | 6 ++++++ kern-features.rc | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 features/numa/numa_x86_64.cfg create mode 100644 features/numa/numa_x86_64.scc diff --git a/features/numa/numa.cfg b/features/numa/numa.cfg index 2cf4bae2d3ae..2cb872a75ed4 100644 --- a/features/numa/numa.cfg +++ b/features/numa/numa.cfg @@ -2,7 +2,6 @@ CONFIG_NUMA=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y -CONFIG_X86_64_ACPI_NUMA=y CONFIG_NUMA_EMU=y CONFIG_NODES_SHIFT=6 CONFIG_USE_PERCPU_NUMA_NODE_ID=y diff --git a/features/numa/numa_x86_64.cfg b/features/numa/numa_x86_64.cfg new file mode 100644 index 000000000000..931c46e92040 --- /dev/null +++ b/features/numa/numa_x86_64.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_X86_64_ACPI_NUMA=y diff --git a/features/numa/numa_x86_64.scc b/features/numa/numa_x86_64.scc new file mode 100644 index 000000000000..ffd913df476e --- /dev/null +++ b/features/numa/numa_x86_64.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable numa support on x86_64" + +include numa.scc + +kconf hardware numa_x86_64.cfg diff --git a/kern-features.rc b/kern-features.rc index b5de26de2ebc..e076abe2b8e3 100644 --- a/kern-features.rc +++ b/kern-features.rc @@ -286,6 +286,7 @@ config = features/ocicontainer/ebtables.scc config = features/ocicontainer/cgroup.scc config = features/numa/numa.scc + config = features/numa/numa_x86_64.scc config = features/smack/smack.scc config = features/tpm/tpm-1.2.scc config = features/tpm/tpm-common.scc -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16244): https://lists.yoctoproject.org/g/linux-yocto/message/16244 Mute This Topic: https://lists.yoctoproject.org/mt/117525180/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
