Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / vdso64 / vdso64.lds.S

diff --git a/arch/powerpc/kernel/vdso64/vdso64.lds.S b/arch/powerpc/kernel/vdso64/vdso64.lds.S
index 7d6585f902776dce82bebe7c018d46409101259c..0e615404e247353cd9a696bb086d03486013403e 100644 (file)
--- a/arch/powerpc/kernel/vdso64/vdso64.lds.S
+++ b/arch/powerpc/kernel/vdso64/vdso64.lds.S
@@ -24,7 +24,7 @@ SECTIONS
 
        . = ALIGN(16);
        .text           : {
-               *(.text .stub .text.* .gnu.linkonce.t.*)
+               *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*)
                *(.sfpr .glink)
        }                                               :text
        PROVIDE(__etext = .);
@@ -34,6 +34,12 @@ SECTIONS
        . = ALIGN(8);
        __ftr_fixup     : { *(__ftr_fixup) }
 
+       . = ALIGN(8);
+       __mmu_ftr_fixup : { *(__mmu_ftr_fixup) }
+
+       . = ALIGN(8);
+       __lwsync_fixup  : { *(__lwsync_fixup) }
+
        . = ALIGN(8);
        __fw_ftr_fixup  : { *(__fw_ftr_fixup) }