1 files changed, 12 insertions, 11 deletions

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index ad2d66c93a5c..0d5db5279c5c 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -23,20 +23,20 @@ SECTIONS
                         *(.init.text)
                         _einittext = .;
                 __proc_info_begin = .;
-                        *(.proc.info)
+                        *(.proc.info.init)
                 __proc_info_end = .;
                 __arch_info_begin = .;
-                        *(.arch.info)
+                        *(.arch.info.init)
                 __arch_info_end = .;
                 __tagtable_begin = .;
-                        *(.taglist)
+                        *(.taglist.init)
                 __tagtable_end = .;
                 . = ALIGN(16);
                 __setup_start = .;
                         *(.init.setup)
                 __setup_end = .;
                 __early_begin = .;
-                        *(__early_param)
+                        *(.early_param.init)
                 __early_end = .;
                 __initcall_start = .;
                         *(.initcall1.init)
@@ -89,13 +89,6 @@ SECTIONS
                 *(.got)                 /* Global offset table          */
         }
 
-        . = ALIGN(16);
-        __ex_table : {                  /* Exception table              */
-                __start___ex_table = .;
-                        *(__ex_table)
-                __stop___ex_table = .;
-        }
-
         RODATA
 
         _etext = .;                     /* End of text and rodata section */
@@ -138,6 +131,14 @@ SECTIONS
                 *(.data.cacheline_aligned)
 
                 /*
+                 * The exception fixup table (might need resorting at runtime)
+                 */
+                . = ALIGN(32);
+                __start___ex_table = .;
+                *(__ex_table)
+                __stop___ex_table = .;
+
+                /*
                  * and the usual data section
                  */
                 *(.data)