Revert "msm: Make CONFIG_STRICT_MEMORY_RWX even stricter"
This reverts commit a9c567fb0f057b09aa8eef9d01a5182c606ffb0b
Change-Id: I68ec00bb5b24466ef591d1d4ef150d2bf96a816d
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 96933a3..7d767c3 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -93,9 +93,6 @@
_text = .;
HEAD_TEXT
}
-#ifdef CONFIG_STRICT_MEMORY_RWX
- . = ALIGN(1<<SECTION_SHIFT);
-#endif
.text : { /* Real text segment */
_stext = .; /* Text and read-only data */
@@ -118,10 +115,10 @@
*(.got) /* Global offset table */
ARM_CPU_KEEP(PROC_INFO)
}
-
#ifdef CONFIG_STRICT_MEMORY_RWX
. = ALIGN(1<<SECTION_SHIFT);
#endif
+
RO_DATA(PAGE_SIZE)
#ifdef CONFIG_ARM_UNWIND
@@ -159,9 +156,6 @@
.init.proc.info : {
ARM_CPU_DISCARD(PROC_INFO)
}
-#ifdef CONFIG_STRICT_MEMORY_RWX
- . = ALIGN(1<<SECTION_SHIFT);
-#endif
.init.arch.info : {
__arch_info_begin = .;
*(.arch.info.init)
@@ -196,6 +190,10 @@
INIT_RAM_FS
}
#ifndef CONFIG_XIP_KERNEL
+#ifdef CONFIG_STRICT_MEMORY_RWX
+ . = ALIGN(1<<SECTION_SHIFT);
+#endif
+ __init_data = .;
.exit.data : {
ARM_EXIT_KEEP(EXIT_DATA)
}