From: Will Deacon <will@xxxxxxxxxx>
commit 770093459b9b333380aa71f2c31c60b14895c1df upstream.
Commit 031495635b46 ("arm64: Do not defer reserve_crashkernel() for
platforms with no DMA memory zones") introduced different definitions
for 'arm64_dma_phys_limit' depending on CONFIG_ZONE_DMA{,32} based on
a late suggestion from Pasha. Sadly, this results in a build error when
passing W=1:
| arch/arm64/mm/init.c:90:19: error: conflicting type qualifiers for 'arm64_dma_phys_limit'
Drop the 'const' for now and use '__ro_after_init' consistently.
Link: https://lore.kernel.org/r/202203090241.aj7paWeX-lkp@xxxxxxxxx
Link: https://lore.kernel.org/r/CA+CK2bDbbx=8R=UthkMesWOST8eJMtOGJdfMRTFSwVmo0Vn0EA@xxxxxxxxxxxxxx
Fixes: 031495635b46 ("arm64: Do not defer reserve_crashkernel() for platforms with no DMA memory zones")
Signed-off-by: Will Deacon <will@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm64/mm/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(memstart_addr);
#if IS_ENABLED(CONFIG_ZONE_DMA) || IS_ENABLED(CONFIG_ZONE_DMA32)
phys_addr_t __ro_after_init arm64_dma_phys_limit;
#else
-const phys_addr_t arm64_dma_phys_limit = PHYS_MASK + 1;
+phys_addr_t __ro_after_init arm64_dma_phys_limit = PHYS_MASK + 1;
#endif
#ifdef CONFIG_KEXEC_CORE
Patches currently in stable-queue which might be from will@xxxxxxxxxx are
queue-5.15/arm64-signal-nofpsimd-do-not-allocate-fp-simd-context-when-not-available.patch
queue-5.15/arm64-do-not-defer-reserve_crashkernel-for-platforms-with-no-dma-memory-zones.patch
queue-5.15/arm64-mm-avoid-fixmap-race-condition-when-create-pud.patch
queue-5.15/arm64-mm-drop-const-from-conditional-arm64_dma_phys_limit-definition.patch
queue-5.15/arm64-prevent-instrumentation-of-bp-hardening-callba.patch
queue-5.15/arm64-module-remove-noload-from-linker-script.patch
