diff options
author | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:50 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:50 +0000 |
commit | 58f7553fa424fd0fd74e8b796d50c66014cebebe (patch) | |
tree | 8aecb1d047b1df2abbfa1ef323d2a724a6a61c77 /arch/x86/kernel/alternative.c | |
parent | dd91c555461261fed220ae29a508f508a0afeb43 (diff) | |
parent | 9326e4f1e5dd1a4410c429638d3c412b6fc17040 (diff) |
Merge remote-tracking branch 'spi/for-5.10' into spi-linus
Diffstat (limited to 'arch/x86/kernel/alternative.c')
-rw-r--r-- | arch/x86/kernel/alternative.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index cdaab30880b9..4adbe65afe23 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1103,6 +1103,10 @@ noinstr int poke_int3_handler(struct pt_regs *regs) */ goto out_put; + case RET_INSN_OPCODE: + int3_emulate_ret(regs); + break; + case CALL_INSN_OPCODE: int3_emulate_call(regs, (long)ip + tp->rel32); break; @@ -1277,6 +1281,7 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr, switch (tp->opcode) { case INT3_INSN_OPCODE: + case RET_INSN_OPCODE: break; case CALL_INSN_OPCODE: |