From: Arnd Bergmann Date: Fri, 19 Feb 2016 15:41:54 +0000 (+0100) Subject: ARM: 8535/1: mm: DEBUG_RODATA makes no sense with XIP_KERNEL X-Git-Tag: v4.6-rc1~87^2^4~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac96680d22ed86168bcccb4aae768bddb869481d;p=platform%2Fkernel%2Flinux-exynos.git ARM: 8535/1: mm: DEBUG_RODATA makes no sense with XIP_KERNEL When CONFIG_DEBUG_ALIGN_RODATA is set, we get a link error: arch/arm/mm/built-in.o:(.data+0x4bc): undefined reference to `__start_rodata_section_aligned' However, this combination is useless, as XIP_KERNEL implies that all the RODATA is already marked readonly, so both CONFIG_DEBUG_RODATA and CONFIG_DEBUG_ALIGN_RODATA (which depends on the other) are not needed with XIP_KERNEL, and this patches enforces that using a Kconfig dependency. Signed-off-by: Arnd Bergmann Fixes: 25362dc496ed ("ARM: 8501/1: mm: flip priority of CONFIG_DEBUG_RODATA") Acked-by: Ard Biesheuvel Signed-off-by: Russell King --- diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 4daeda0..5534766 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -1039,7 +1039,7 @@ config ARCH_SUPPORTS_BIG_ENDIAN config DEBUG_RODATA bool "Make kernel text and rodata read-only" - depends on MMU + depends on MMU && !XIP_KERNEL default y if CPU_V7 help If this is set, kernel text and rodata memory will be made