2 files changed, 9 insertions, 1 deletions

diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds
index 4e2389340837..8e66ccb0935e 100644
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@@ -69,6 +69,7 @@ SECTIONS {
                 SCHED_TEXT
                 LOCK_TEXT
                 *(.text..lock)
+                *(.fixup)
 
                 . = ALIGN(16);          /* Exception table              */
                 __start___ex_table = .;
@@ -161,6 +162,13 @@ SECTIONS {
                 _edata = . ;
         } > DATA
 
+        .m68k_fixup : {
+                __start_fixup = .;
+                *(.m68k_fixup)
+                __stop_fixup = .;
+        } > DATA
+        NOTES > DATA
+
         .init.text : {
                 . = ALIGN(PAGE_SIZE);
                 __init_begin = .;
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S
index 3d99a04f2394..69ec79638870 100644
--- a/arch/m68k/kernel/vmlinux.lds.S
+++ b/arch/m68k/kernel/vmlinux.lds.S
@@ -1,4 +1,4 @@
-#ifdef CONFIG_MMU
+#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
 PHDRS
 {
   text PT_LOAD FILEHDR PHDRS FLAGS (7);