aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2016-02-19 10:41:56 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2016-02-22 06:39:43 -0500
commit1475399207548333311e374446a113d4733b3878 (patch)
tree783395b906c74af773facd2b63d7bedd511c5a38
parent91c617d7a3af3b599ef97c48253a3f5ebb6cdadd (diff)
ARM: 8537/1: drop unused DEBUG_RODATA from XIP_KERNEL
With CONFIG_DEBUG_RODATA not being sensible under XIP_KERNEL, remove it from the XIP linker script. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/vmlinux-xip.lds.S10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index 40bc4cadb959..cba1ec899a69 100644
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -8,9 +8,6 @@
8#include <asm/thread_info.h> 8#include <asm/thread_info.h>
9#include <asm/memory.h> 9#include <asm/memory.h>
10#include <asm/page.h> 10#include <asm/page.h>
11#ifdef CONFIG_DEBUG_RODATA
12#include <asm/pgtable.h>
13#endif
14 11
15#define PROC_INFO \ 12#define PROC_INFO \
16 . = ALIGN(4); \ 13 . = ALIGN(4); \
@@ -92,10 +89,6 @@ SECTIONS
92 HEAD_TEXT 89 HEAD_TEXT
93 } 90 }
94 91
95#ifdef CONFIG_DEBUG_RODATA
96 . = ALIGN(1<<SECTION_SHIFT);
97#endif
98
99 .text : { /* Real text segment */ 92 .text : { /* Real text segment */
100 _stext = .; /* Text and read-only data */ 93 _stext = .; /* Text and read-only data */
101 IDMAP_TEXT 94 IDMAP_TEXT
@@ -115,9 +108,6 @@ SECTIONS
115 ARM_CPU_KEEP(PROC_INFO) 108 ARM_CPU_KEEP(PROC_INFO)
116 } 109 }
117 110
118#ifdef CONFIG_DEBUG_RODATA
119 . = ALIGN(1<<SECTION_SHIFT);
120#endif
121 RO_DATA(PAGE_SIZE) 111 RO_DATA(PAGE_SIZE)
122 112
123 . = ALIGN(4); 113 . = ALIGN(4);