X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fvmlinux.lds.S;h=2b254e88595c76e15c233290e0f1339f04e5a621;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=3ca574ee277271e04b05c79ed956337b3e7dfb7a;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 3ca574ee2..2b254e885 100644
--- 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 = .;
 
 		/*