Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / boot / setup.ld

diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld
index 0149e41..3da1c37 100644 (file)
--- a/arch/x86/boot/setup.ld
+++ b/arch/x86/boot/setup.ld
@@ -51,7 +51,10 @@ SECTIONS
        . = ALIGN(16);
        _end = .;
 
-       /DISCARD/ : { *(.note*) }
+       /DISCARD/       : {
+               *(.eh_frame)
+               *(.note*)
+       }
 
        /*
         * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility: