[PATCH 04/15] ARM: fix LPAE build without ARM_PATCH_PHYS_VIRT

Arnd Bergmann arnd at arndb.de
Wed Jan 28 11:48:11 PST 2015


We may want to disable ARM_PATCH_PHYS_VIRT on kernels
using LPAE, but currently the early_paging_init() function
unconditionally calls fixup_pv_table().

This patch encloses the call to fixup_pv_table in an #ifdef,
mirroring what we do for normal (non-LPAE) mode.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
 arch/arm/mm/mmu.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 4e6ef896c619..235aed5f8284 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1422,8 +1422,10 @@ void __init early_paging_init(const struct machine_desc *mdesc,
 	mdesc->init_meminfo();
 
 	/* Run the patch stub to update the constants */
+#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
 	fixup_pv_table(&__pv_table_begin,
 		(&__pv_table_end - &__pv_table_begin) << 2);
+#endif
 
 	/*
 	 * Cache cleaning operations for self-modifying code
-- 
2.1.0.rc2




More information about the linux-arm-kernel mailing list