1 files changed, 25 insertions, 2 deletions

diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index e613b02bb2f0..5169cc805464 100644
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -118,7 +118,7 @@ void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end)
 }
 
 #ifdef CONFIG_PPC_BOOK3S_64
-void do_stf_entry_barrier_fixups(enum stf_barrier_type types)
+static void do_stf_entry_barrier_fixups(enum stf_barrier_type types)
 {
         unsigned int instrs[3], *dest;
         long *start, *end;
@@ -168,7 +168,7 @@ void do_stf_entry_barrier_fixups(enum stf_barrier_type types)
                                                            : "unknown");
 }
 
-void do_stf_exit_barrier_fixups(enum stf_barrier_type types)
+static void do_stf_exit_barrier_fixups(enum stf_barrier_type types)
 {
         unsigned int instrs[6], *dest;
         long *start, *end;
@@ -347,6 +347,29 @@ void do_barrier_nospec_fixups_range(bool enable, void *fixup_start, void *fixup_
 
         printk(KERN_DEBUG "barrier-nospec: patched %d locations\n", i);
 }
+
+static void patch_btb_flush_section(long *curr)
+{
+        unsigned int *start, *end;
+
+        start = (void *)curr + *curr;
+        end = (void *)curr + *(curr + 1);
+        for (; start < end; start++) {
+                pr_devel("patching dest %lx\n", (unsigned long)start);
+                patch_instruction(start, PPC_INST_NOP);
+        }
+}
+
+void do_btb_flush_fixups(void)
+{
+        long *start, *end;
+
+        start = PTRRELOC(&__start__btb_flush_fixup);
+        end = PTRRELOC(&__stop__btb_flush_fixup);
+
+        for (; start < end; start += 2)
+                patch_btb_flush_section(start);
+}
 #endif /* CONFIG_PPC_FSL_BOOK3E */
 
 void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)