Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm...

[cascardo/linux.git] / arch / mips / kernel / vmlinux.lds.S

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 54d653e..a82c178 100644 (file)
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -136,6 +136,27 @@ SECTIONS
 #ifdef CONFIG_SMP
        PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
 #endif
+
+#ifdef CONFIG_RELOCATABLE
+       . = ALIGN(4);
+
+       .data.reloc : {
+               _relocation_start = .;
+               /*
+                * Space for relocation table
+                * This needs to be filled so that the
+                * relocs tool can overwrite the content.
+                * An invalid value is left at the start of the
+                * section to abort relocation if the table
+                * has not been filled in.
+                */
+               LONG(0xFFFFFFFF);
+               FILL(0);
+               . += CONFIG_RELOCATION_TABLE_SIZE - 4;
+               _relocation_end = .;
+       }
+#endif
+
 #ifdef CONFIG_MIPS_RAW_APPENDED_DTB
        __appended_dtb = .;
        /* leave space for appended DTB */