2 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 4554c961251c..e7d22dbcb691 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -624,6 +624,9 @@ void __attribute__((noreturn)) __bug(const char *file, int line, void *data)
                 printk(" - extra data = %p", data);
         printk("\n");
         *(int *)0 = 0;
+
+        /* Avoid "noreturn function does return" */
+        for (;;);
 }
 EXPORT_SYMBOL(__bug);
 
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index ad2d66c93a5c..08e58ecd44be 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)