Commit 027eb72c authored Feb 02, 2017 by Linus Torvalds

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull  objtool fix from Ingo Molnar:
 "A fix for a bad opcode in objtool's instruction decoder"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix IRET's opcode

parents 1fc576b8 b5b46c47

tools/objtool/arch/x86/decode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,9 +150,9 @@ int arch_decode_instruction(struct elf elf, struct section sec,
		*type = INSN_RETURN;
		break;

		case 0xc5: /* iret */
		case 0xca: /* retf */
		case 0xcb: /* retf */
		case 0xcf: /* iret */
		*type = INSN_CONTEXT_SWITCH;
		break;