Merge tag 'for-linus-5.8b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / powerpc / kernel / jump_label.c

diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c
index ca37702..1448580 100644 (file)
--- a/arch/powerpc/kernel/jump_label.c
+++ b/arch/powerpc/kernel/jump_label.c
@@ -6,14 +6,15 @@
 #include <linux/kernel.h>
 #include <linux/jump_label.h>
 #include <asm/code-patching.h>
+#include <asm/inst.h>
 
 void arch_jump_label_transform(struct jump_entry *entry,
                               enum jump_label_type type)
 {
-       u32 *addr = (u32 *)(unsigned long)entry->code;
+       struct ppc_inst *addr = (struct ppc_inst *)(unsigned long)entry->code;
 
        if (type == JUMP_LABEL_JMP)
                patch_branch(addr, entry->target, 0);
        else
-               patch_instruction(addr, PPC_INST_NOP);
+               patch_instruction(addr, ppc_inst(PPC_INST_NOP));
 }