1 files changed, 13 insertions, 2 deletions

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index b16c07914b55..065d35de0e01 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -40,6 +40,11 @@ SECTIONS
                 __tagtable_begin = .;
                         *(.taglist.init)
                 __tagtable_end = .;
+#ifdef CONFIG_SMP_ON_UP
+                __smpalt_begin = .;
+                        *(.alt.smp.init)
+                __smpalt_end = .;
+#endif
 
                 INIT_SETUP(16)
 
@@ -104,8 +109,6 @@ SECTIONS
 
         RO_DATA(PAGE_SIZE)
 
-        _etext = .;                     /* End of text and rodata section */
-
 #ifdef CONFIG_ARM_UNWIND
         /*
          * Stack unwinding tables
@@ -123,6 +126,8 @@ SECTIONS
         }
 #endif
 
+        _etext = .;                     /* End of text and rodata section */
+
 #ifdef CONFIG_XIP_KERNEL
         __data_loc = ALIGN(4);          /* location in binary */
         . = PAGE_OFFSET + TEXT_OFFSET;
@@ -237,6 +242,12 @@ SECTIONS
 
         /* Default discards */
         DISCARDS
+
+#ifndef CONFIG_SMP_ON_UP
+        /DISCARD/ : {
+                *(.alt.smp.init)
+        }
+#endif
 }
 
 /*