diff options
| author | Arnd Bergmann | 2018-07-10 17:16:27 +0200 |
|---|---|---|
| committer | Will Deacon | 2018-07-10 19:21:34 +0200 |
| commit | 54501ac150fed82b256e6a9bd4e2201bc3b21b22 (patch) | |
| tree | f416f5c9fb6e0a156e7ac62bd84cb0e3b3ab842e /arch/arm64/Kconfig | |
| parent | arm64: numa: rework ACPI NUMA initialization (diff) | |
| download | kernel-qcow2-linux-54501ac150fed82b256e6a9bd4e2201bc3b21b22.tar.gz kernel-qcow2-linux-54501ac150fed82b256e6a9bd4e2201bc3b21b22.tar.xz kernel-qcow2-linux-54501ac150fed82b256e6a9bd4e2201bc3b21b22.zip | |
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: e7d4bac428ed ("arm64: add ARM64-specific support for flatmem")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c548b3dd48ab..2e7609e4d08a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -787,7 +787,7 @@ config ARCH_SELECT_MEMORY_MODEL def_bool ARCH_SPARSEMEM_ENABLE config ARCH_FLATMEM_ENABLE - def_bool y + def_bool !NUMA config HAVE_ARCH_PFN_VALID def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM |