1 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c
index b41873f33e69..a8ab540d7e73 100644
--- a/arch/arm/kernel/probes.c
+++ b/arch/arm/kernel/probes.c
@@ -202,13 +202,14 @@ prepare_emulated_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
 #ifdef CONFIG_THUMB2_KERNEL
         if (thumb) {
                 u16 *thumb_insn = (u16 *)asi->insn;
-                thumb_insn[1] = 0x4770; /* Thumb bx lr */
-                thumb_insn[2] = 0x4770; /* Thumb bx lr */
+                /* Thumb bx lr */
+                thumb_insn[1] = __opcode_to_mem_thumb16(0x4770);
+                thumb_insn[2] = __opcode_to_mem_thumb16(0x4770);
                 return insn;
         }
-        asi->insn[1] = 0xe12fff1e; /* ARM bx lr */
+        asi->insn[1] = __opcode_to_mem_arm(0xe12fff1e); /* ARM bx lr */
 #else
-        asi->insn[1] = 0xe1a0f00e; /* mov pc, lr */
+        asi->insn[1] = __opcode_to_mem_arm(0xe1a0f00e); /* mov pc, lr */
 #endif
         /* Make an ARM instruction unconditional */
         if (insn < 0xe0000000)
@@ -228,12 +229,12 @@ set_emulated_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
         if (thumb) {
                 u16 *ip = (u16 *)asi->insn;
                 if (is_wide_instruction(insn))
-                        *ip++ = insn >> 16;
-                *ip++ = insn;
+                        *ip++ = __opcode_to_mem_thumb16(insn >> 16);
+                *ip++ = __opcode_to_mem_thumb16(insn);
                 return;
         }
 #endif
-        asi->insn[0] = insn;
+        asi->insn[0] = __opcode_to_mem_arm(insn);
 }
 
 /*