ARM: vmlinux*.lds.S: some decruftification

Remove stuff from vmlinux.lds.S that is relevant only to the XIP build,
and stuff from vmlinux-xip.lds.S related to self-modifying code that
makes no sense in the XIP case.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Chris Brandt <Chris.Brandt@renesas.com>

diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index 1598caada3bb747da6d8d24842399348cd1932d1..88e8db3979da359d2ba019b5454f0aad0d80daca 100644 (file)
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -77,9 +77,7 @@ SECTIONS
                *(.text.fixup)
                *(__ex_table)
 #endif
-#ifndef CONFIG_SMP_ON_UP
                *(.alt.smp.init)
-#endif
                *(.discard)
                *(.discard.*)
        }
@@ -181,18 +179,6 @@ SECTIONS
                *(.taglist.init)
                __tagtable_end = .;
        }
-#ifdef CONFIG_SMP_ON_UP
-       .init.smpalt : {
-               __smpalt_begin = .;
-               *(.alt.smp.init)
-               __smpalt_end = .;
-       }
-#endif
-       .init.pv_table : {
-               __pv_table_begin = .;
-               *(.pv_table)
-               __pv_table_end = .;
-       }
        .init.data : {
                INIT_SETUP(16)
                INIT_CALLS

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index c83a7ba737d6a96dedfe1dec88967d824309e538..4f86b4b7bdcc2be92da83a6d6b85c354d0a06f0e 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -236,9 +236,8 @@ SECTIONS
        . = ALIGN(THREAD_SIZE);
 #endif
        __init_end = .;
-       __data_loc = .;
 
-       .data : AT(__data_loc) {
+       .data : {
                _data = .;              /* address in memory */
                _sdata = .;
 
@@ -260,7 +259,6 @@ SECTIONS
 
                _edata = .;
        }
-       _edata_loc = __data_loc + SIZEOF(.data);
 
        BUG_TABLE