Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54501ac1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Will Deacon
Browse files

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: e7d4bac4 ("arm64: add ARM64-specific support for flatmem")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent e1896249
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -787,7 +787,7 @@ config ARCH_SELECT_MEMORY_MODEL
	def_bool ARCH_SPARSEMEM_ENABLE
	def_bool ARCH_SPARSEMEM_ENABLE


config ARCH_FLATMEM_ENABLE
config ARCH_FLATMEM_ENABLE
	def_bool y
	def_bool !NUMA


config HAVE_ARCH_PFN_VALID
config HAVE_ARCH_PFN_VALID
	def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
	def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM