Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 80dc9f8..a1e4ec2 100644 (file)
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -12,7 +12,7 @@ OUTPUT_ARCH(sh)
 
 #include <asm/thread_info.h>
 #include <asm/cache.h>
-#include <asm-generic/vmlinux.lds.h>
+#include <asm/vmlinux.lds.h>
 
 ENTRY(_start)
 SECTIONS
@@ -70,6 +70,8 @@ SECTIONS
 
        _edata = .;                     /* End of data section */
 
+       DWARF_EH_FRAME
+
        . = ALIGN(PAGE_SIZE);           /* Init code and data */
        __init_begin = .;
        INIT_TEXT_SECTION(PAGE_SIZE)
@@ -97,16 +99,8 @@ SECTIONS
        _ebss = .;                      /* uClinux MTD sucks */
        _end = . ;
 
-       /*
-        * 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/ : {
-               EXIT_CALL
-       }
-
        STABS_DEBUG
        DWARF_DEBUG
+
+       DISCARDS
 }