diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-17 11:33:04 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-17 16:08:40 +0200 |
| commit | 0871b7248113ebfccbfabcd3fd1f867a2bc681f4 (patch) | |
| tree | 89a5fddb18c7133654d3e53c0e84a3eebbd4ed7b /arch | |
| parent | ARM: invalidate L1 before enabling coherency (diff) | |
| download | linux-0871b7248113ebfccbfabcd3fd1f867a2bc681f4.tar.xz linux-0871b7248113ebfccbfabcd3fd1f867a2bc681f4.zip | |
ARM: fix __virt_to_idmap build error on !MMU
Fengguang Wu reports that building ARM with !MMU results in the
following build error:
arch/arm/kernel/built-in.o: In function `__soft_restart':
>> :(.text+0x1624): undefined reference to `arch_virt_to_idmap'
Fix this by adding an appropriate IS_ENABLED(CONFIG_MMU) into the
__virt_to_idmap() inline function.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 6f225acc07c5..b7f6fb462ea0 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -286,7 +286,7 @@ extern phys_addr_t (*arch_virt_to_idmap)(unsigned long x); */ static inline phys_addr_t __virt_to_idmap(unsigned long x) { - if (arch_virt_to_idmap) + if (IS_ENABLED(CONFIG_MMU) && arch_virt_to_idmap) return arch_virt_to_idmap(x); else return __virt_to_phys(x); |