ARM: 8322/1: keep .text and .fixup regions closer together

This moves all fixup snippets to the .text.fixup section, which is
a special section that gets emitted along with the .text section
for each input object file, i.e., the snippets are kept much closer
to the code they refer to, which helps prevent linker failure on
large kernels.

Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

3 files changed, 3 insertions, 6 deletions

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 672b21942fff..570306c49406 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -545,7 +545,7 @@ ENDPROC(__und_usr)
 /*
  * The out of line fixup for the ldrt instructions above.
  */
-        .pushsection .fixup, "ax"
+        .pushsection .text.fixup, "ax"
         .align  2
 4:      str     r4, [sp, #S_PC]                 @ retry current instruction
         ret     r9
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index afdd51e30bec..1361756782c7 100644
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
@@ -42,7 +42,7 @@
         "       cmp             %0, #0\n"                       \
         "       movne           %0, %4\n"                       \
         "2:\n"                                                  \
-        "       .section         .fixup,\"ax\"\n"               \
+        "       .section         .text.fixup,\"ax\"\n"          \
         "       .align          2\n"                            \
         "3:     mov             %0, %5\n"                       \
         "       b               2b\n"                           \
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index e8d5fba807a0..7a301be9ac67 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -74,7 +74,7 @@ SECTIONS
                 ARM_EXIT_DISCARD(EXIT_DATA)
                 EXIT_CALL
 #ifndef CONFIG_MMU
-                *(.fixup)
+                *(.text.fixup)
                 *(__ex_table)
 #endif
 #ifndef CONFIG_SMP_ON_UP
@@ -109,9 +109,6 @@ SECTIONS
                         SCHED_TEXT
                         LOCK_TEXT
                         KPROBES_TEXT
-#ifdef CONFIG_MMU
-                        *(.fixup)
-#endif
                         *(.gnu.warning)
                         *(.glue_7)
                         *(.glue_7t)