1 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index b31aa73e8076..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
@@ -100,6 +100,7 @@ SECTIONS
 
         .text : {                       /* Real text segment            */
                 _stext = .;             /* Text and read-only data      */
+                        IDMAP_TEXT
                         __exception_text_start = .;
                         *(.exception.text)
                         __exception_text_end = .;
@@ -108,10 +109,6 @@ SECTIONS
                         SCHED_TEXT
                         LOCK_TEXT
                         KPROBES_TEXT
-                        IDMAP_TEXT
-#ifdef CONFIG_MMU
-                        *(.fixup)
-#endif
                         *(.gnu.warning)
                         *(.glue_7)
                         *(.glue_7t)