linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / kernel / vmlinux.lds.S

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 3ca574e..2b254e8 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -4,6 +4,7 @@
  */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <linux/config.h>
 #include <asm/thread_info.h>
 #include <asm/memory.h>
        
@@ -79,10 +80,6 @@ SECTIONS
                *(.exit.text)
                *(.exit.data)
                *(.exitcall.exit)
-#ifndef CONFIG_MMU
-               *(.fixup)
-               *(__ex_table)
-#endif
        }
 
        .text : {                       /* Real text segment            */
@@ -90,9 +87,7 @@ SECTIONS
                        *(.text)
                        SCHED_TEXT
                        LOCK_TEXT
-#ifdef CONFIG_MMU
                        *(.fixup)
-#endif
                        *(.gnu.warning)
                        *(.rodata)
                        *(.rodata.*)
@@ -147,9 +142,7 @@ SECTIONS
                 */
                . = ALIGN(32);
                __start___ex_table = .;
-#ifdef CONFIG_MMU
                *(__ex_table)
-#endif
                __stop___ex_table = .;
 
                /*