projects/linux·commit 2a381106

ARM: Fix XIP kernels

2a381106 · Russell King <[email protected]> · 2016-11-16 23:51:19 +00:00

Commit 7619751f8c90 ("ARM: 8595/2: apply more __ro_after_init") caused
a regression with XIP kernels by moving the __ro_after_init data into
the read-only section.  With XIP kernels, the read-only section is
located in read-only memory from the very beginning.

Work around this by moving the __ro_after_init data back into the .data
section, which will be in RAM, and hence will be writable.

It should be noted that in doing so, this remains writable after init.

Fixes: 7619751f8c90 ("ARM: 8595/2: apply more __ro_after_init")
Reported-by: Andrea Merello <[email protected]>
Tested-by: Andrea Merello <[email protected]> [ XIP stm32 ]
Tested-by: Alexandre Torgue <[email protected]>
Signed-off-by: Russell King <[email protected]>
Commit
2a3811068fbc6bf09bb09d166b65394b091c1085
Parents
256ff1cf

Changes

1 files changed · +5 −0

FileStatusAddDelContent
arch/arm/kernel/vmlinux-xip.lds.Smodified+5−0View file

arch/arm/kernel/vmlinux-xip.lds.S

View file
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index 7fa487e..37b2a11 100644
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -3,6 +3,9 @@
* Written by Martin Mares <[email protected]>
*/
+/* No __ro_after_init data in the .rodata section - which will always be ro */
+#define RO_AFTER_INIT_DATA
+
#include <asm-generic/vmlinux.lds.h>
#include <asm/cache.h>
#include <asm/thread_info.h>
@@ -223,6 +226,8 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
__init_end = .;
+ *(.data..ro_after_init)
+
NOSAVE_DATA
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
READ_MOSTLY_DATA(L1_CACHE_BYTES)