Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

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

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 53d57d1..87a72c6 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -35,7 +35,7 @@ SECTIONS
                ALIGN_FUNCTION();
                *(.text.head)
                _text = .;
-               *(.text .fixup .text.init.refok .exit.text.refok)
+               *(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
                SCHED_TEXT
                LOCK_TEXT
                KPROBES_TEXT
@@ -125,6 +125,12 @@ SECTIONS
                *(__ftr_fixup)
                __stop___ftr_fixup = .;
        }
+       . = ALIGN(8);
+       __lwsync_fixup : AT(ADDR(__lwsync_fixup) - LOAD_OFFSET) {
+               __start___lwsync_fixup = .;
+               *(__lwsync_fixup)
+               __stop___lwsync_fixup = .;
+       }
 #ifdef CONFIG_PPC64
        . = ALIGN(8);
        __fw_ftr_fixup : AT(ADDR(__fw_ftr_fixup) - LOAD_OFFSET) {