ARM: linker script: factor out stuff for the .text section

Move common entries to vmlinux.lds.h as ARM_TEXT.

Signed-off-by: Nicolas Pitre <nico@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 4bd4229..4ddb547 100644 (file)
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -53,24 +53,7 @@ SECTIONS
 
        .text : {                       /* Real text segment            */
                _stext = .;             /* Text and read-only data      */
-                       IDMAP_TEXT
-                       __entry_text_start = .;
-                       *(.entry.text)
-                       __entry_text_end = .;
-                       IRQENTRY_TEXT
-                       SOFTIRQENTRY_TEXT
-                       TEXT_TEXT
-                       SCHED_TEXT
-                       CPUIDLE_TEXT
-                       LOCK_TEXT
-                       HYPERVISOR_TEXT
-                       KPROBES_TEXT
-                       *(.gnu.warning)
-                       *(.glue_7)
-                       *(.glue_7t)
-               . = ALIGN(4);
-               *(.got)                 /* Global offset table          */
-                       ARM_CPU_KEEP(PROC_INFO)
+               ARM_TEXT
        }
 
        RO_DATA(PAGE_SIZE)

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index b34fbaf..a02a96c 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -56,24 +56,7 @@ SECTIONS
 
        .text : {                       /* Real text segment            */
                _stext = .;             /* Text and read-only data      */
-                       IDMAP_TEXT
-                       __entry_text_start = .;
-                       *(.entry.text)
-                       __entry_text_end = .;
-                       IRQENTRY_TEXT
-                       SOFTIRQENTRY_TEXT
-                       TEXT_TEXT
-                       SCHED_TEXT
-                       CPUIDLE_TEXT
-                       LOCK_TEXT
-                       HYPERVISOR_TEXT
-                       KPROBES_TEXT
-                       *(.gnu.warning)
-                       *(.glue_7)
-                       *(.glue_7t)
-               . = ALIGN(4);
-               *(.got)                 /* Global offset table          */
-                       ARM_CPU_KEEP(PROC_INFO)
+               ARM_TEXT
        }
 
 #ifdef CONFIG_DEBUG_ALIGN_RODATA

diff --git a/arch/arm/kernel/vmlinux.lds.h b/arch/arm/kernel/vmlinux.lds.h
index 1258b66..0ef86d7 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.h
+++ b/arch/arm/kernel/vmlinux.lds.h
@@ -58,3 +58,23 @@
                ARM_MMU_DISCARD(*(__ex_table))                          \
                *(.discard)                                             \
                *(.discard.*)
+
+#define ARM_TEXT                                                       \
+               IDMAP_TEXT                                              \
+               __entry_text_start = .;                                 \
+               *(.entry.text)                                          \
+               __entry_text_end = .;                                   \
+               IRQENTRY_TEXT                                           \
+               SOFTIRQENTRY_TEXT                                       \
+               TEXT_TEXT                                               \
+               SCHED_TEXT                                              \
+               CPUIDLE_TEXT                                            \
+               LOCK_TEXT                                               \
+               HYPERVISOR_TEXT                                         \
+               KPROBES_TEXT                                            \
+               *(.gnu.warning)                                         \
+               *(.glue_7)                                              \
+               *(.glue_7t)                                             \
+               . = ALIGN(4);                                           \
+               *(.got)                 /* Global offset table */       \
+               ARM_CPU_KEEP(PROC_INFO)