Merge branch 'linus' into perfcounters/core

[mv-sheeva.git] / arch / sh / kernel / vmlinux.lds.S

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index f53c76acaede2f1af80aaec431e53308c4681bee..0ce254bca92fc5ce2541ec4e0080df97c17c97ed 100644 (file)
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -163,16 +163,14 @@ SECTIONS
                _end = . ;
        }
 
+       STABS_DEBUG
+       DWARF_DEBUG
+
        /*
         * When something in the kernel is NOT compiled as a module, the
         * module cleanup code and data are put into these segments. Both
         * can then be thrown away, as cleanup code is never called unless
         * it's a module.
         */
-       /DISCARD/ : {
-               *(.exitcall.exit)
-       }
-
-       STABS_DEBUG
-       DWARF_DEBUG
+       DISCARDS
 }