Commit ac96680d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Russell King

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 25362dc4 ("ARM: 8501/1: mm: flip priority of CONFIG_DEBUG_RODATA")
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8d9f4913
...@@ -1039,7 +1039,7 @@ config ARCH_SUPPORTS_BIG_ENDIAN ...@@ -1039,7 +1039,7 @@ config ARCH_SUPPORTS_BIG_ENDIAN
config DEBUG_RODATA config DEBUG_RODATA
bool "Make kernel text and rodata read-only" bool "Make kernel text and rodata read-only"
depends on MMU depends on MMU && !XIP_KERNEL
default y if CPU_V7 default y if CPU_V7
help help
If this is set, kernel text and rodata memory will be made If this is set, kernel text and rodata memory will be made
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment