4 files changed, 5 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
index 9352ab5200e5..271793577cdc 100644
--- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
@@ -24,7 +24,7 @@ SECTIONS
 
         . = ALIGN(16);
         .text           : {
-                *(.text .stub .text.* .gnu.linkonce.t.*)
+                *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*)
         }
         PROVIDE(__etext = .);
         PROVIDE(_etext = .);
diff --git a/arch/powerpc/kernel/vdso64/vdso64.lds.S b/arch/powerpc/kernel/vdso64/vdso64.lds.S
index 7d6585f90277..e608d1bd3bff 100644
--- 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 = .);
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 0c3000bf8d75..3c07811989fc 100644
--- 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
diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index f6fd5d2ff10d..973d547ef01d 100644
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -22,6 +22,8 @@ struct fixup_entry {
         unsigned long   value;
         long            start_off;
         long            end_off;
+        long            alt_start_off;
+        long            alt_end_off;
 };
 
 static void patch_feature_section(unsigned long value, struct fixup_entry *fcur)