diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-02 12:54:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-02 12:54:45 -0800 |
| commit | 027eb72cbcf81561867a764074964e2ce9828398 (patch) | |
| tree | 40defa16b78e50efb9c1ffbf9b3b6d4e1027898b /tools | |
| parent | Merge tag 'nfsd-4.10-2' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | objtool: Fix IRET's opcode (diff) | |
| download | linux-dev-027eb72cbcf81561867a764074964e2ce9828398.tar.xz linux-dev-027eb72cbcf81561867a764074964e2ce9828398.zip | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/arch/x86/decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index 5e0dea2cdc01..039636ffb6c8 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -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; |