1 files changed, 8 insertions, 1 deletions

diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.c
index ef13b7c78935..7ad20cfb48a8 100644
--- a/arch/avr32/kernel/vmlinux.lds.c
+++ b/arch/avr32/kernel/vmlinux.lds.c
@@ -26,6 +26,12 @@ SECTIONS
                         _sinittext = .;
                         *(.text.reset)
                         *(.init.text)
+                        /*
+                         * .exit.text is discarded at runtime, not
+                         * link time, to deal with references from
+                         * __bug_table
+                         */
+                        *(.exit.text)
                         _einittext = .;
                 . = ALIGN(4);
                 __tagtable_begin = .;
@@ -86,6 +92,8 @@ SECTIONS
                 __stop___ex_table = .;
         }
 
+        BUG_TABLE
+
         RODATA
 
         . = ALIGN(8192);
@@ -126,7 +134,6 @@ SECTIONS
          * thrown away, as cleanup code is never called unless it's a module.
          */
         /DISCARD/               : {
-                *(.exit.text)
                 *(.exit.data)
                 *(.exitcall.exit)
         }