Merge tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / powerpc / lib / feature-fixups.c

diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index a95ea00..73697c4 100644 (file)
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -62,7 +62,7 @@ static int patch_alt_instruction(unsigned int *src, unsigned int *dest,
                }
        }
 
-       patch_instruction(dest, instr);
+       raw_patch_instruction(dest, instr);
 
        return 0;
 }
@@ -91,7 +91,7 @@ static int patch_feature_section(unsigned long value, struct fixup_entry *fcur)
        }
 
        for (; dest < end; dest++)
-               patch_instruction(dest, PPC_INST_NOP);
+               raw_patch_instruction(dest, PPC_INST_NOP);
 
        return 0;
 }
@@ -170,7 +170,7 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
 
        for (; start < end; start++) {
                dest = (void *)start + *start;
-               patch_instruction(dest, PPC_INST_LWSYNC);
+               raw_patch_instruction(dest, PPC_INST_LWSYNC);
        }
 }
 
@@ -188,7 +188,7 @@ static void do_final_fixups(void)
        length = (__end_interrupts - _stext) / sizeof(int);
 
        while (length--) {
-               patch_instruction(dest, *src);
+               raw_patch_instruction(dest, *src);
                src++;
                dest++;
        }