diff options
| author | Kees Cook | 2016-02-19 16:41:56 +0100 |
|---|---|---|
| committer | Russell King | 2016-02-22 11:39:43 +0000 |
| commit | 1475399207548333311e374446a113d4733b3878 (patch) | |
| tree | 783395b906c74af773facd2b63d7bedd511c5a38 | |
| parent | 91c617d7a3af3b599ef97c48253a3f5ebb6cdadd (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.S | 10 |
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 @@ #include <asm/thread_info.h> #include <asm/memory.h> #include <asm/page.h> -#ifdef CONFIG_DEBUG_RODATA -#include <asm/pgtable.h> -#endif #define PROC_INFO \ . = ALIGN(4); \ @@ -92,10 +89,6 @@ SECTIONS HEAD_TEXT } -#ifdef CONFIG_DEBUG_RODATA - . = ALIGN(1<<SECTION_SHIFT); -#endif - .text : { /* Real text segment */ _stext = .; /* Text and read-only data */ IDMAP_TEXT @@ -115,9 +108,6 @@ SECTIONS ARM_CPU_KEEP(PROC_INFO) } -#ifdef CONFIG_DEBUG_RODATA - . = ALIGN(1<<SECTION_SHIFT); -#endif RO_DATA(PAGE_SIZE) . = ALIGN(4); |