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 <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: Russell King <[email protected]>

diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index 40bc4cadb959b2604c706a6080ccda5295c28bb0..cba1ec899a693c85113659c98144c26993b8f350 100644 (file)
--- 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);