Skip to content

Commit 54501ac

Browse files
arndbwildea01
authored andcommitted
arm64: make flatmem depend on !NUMA
Building without NUMA but with FLATMEM results in a link error because mem_map[] is not available: aarch64-linux-ld -EB -maarch64elfb --no-undefined -X -pie -shared -Bsymbolic --no-apply-dynamic-relocs --build-id -o .tmp_vmlinux1 -T ./arch/arm64/kernel/vmlinux.lds --whole-archive built-in.a --no-whole-archive --start-group arch/arm64/lib/lib.a lib/lib.a --end-group init/do_mounts.o: In function `mount_block_root': do_mounts.c:(.init.text+0x1e8): undefined reference to `mem_map' arch/arm64/kernel/vdso.o: In function `vdso_init': vdso.c:(.init.text+0xb4): undefined reference to `mem_map' This uses the same trick as the other architectures, making flatmem depend on !NUMA to avoid the broken configuration. Fixes: e7d4bac ("arm64: add ARM64-specific support for flatmem") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent e189624 commit 54501ac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm64/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ config ARCH_SELECT_MEMORY_MODEL
787787
def_bool ARCH_SPARSEMEM_ENABLE
788788

789789
config ARCH_FLATMEM_ENABLE
790-
def_bool y
790+
def_bool !NUMA
791791

792792
config HAVE_ARCH_PFN_VALID
793793
def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM

0 commit comments

Comments
 (0)