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.

Russell King committed 11 years ago

Commit 0871b721 parent bac51ad1 file · +1 −1Browse files

Unified · Split

arch/arm/include/asm/memory.h+1−1

@@ -286,7 +286,7 @@ extern phys_addr_t (*arch_virt_to_idmap)(unsigned long x); · 285 unmodified lines
286	*/	286	*/
287	static inline phys_addr_t __virt_to_idmap(unsigned long x)	287	static inline phys_addr_t __virt_to_idmap(unsigned long x)
288	{	288	{
289	if (arch_virt_to_idmap)	289	if (IS_ENABLED(CONFIG_MMU) && arch_virt_to_idmap)
290	return arch_virt_to_idmap(x);	290	return arch_virt_to_idmap(x);
291	else	291	else
292	return __virt_to_phys(x);	292	return __virt_to_phys(x);