diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 12:24:00 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 17:20:05 -0500 |
| commit | 60709c093ed39aadb0f09972ebbc96dc34eb372e (patch) | |
| tree | 983681311986070971d3756d9f8e75868aa7bb9a /tools | |
| parent | 7323f0d2881bbd426ce6bc0a956ef9e739ffe767 (diff) | |
| parent | 0839ffb83e44e5ff1843e932592525fc2bff23ff (diff) | |
nfsd: merge stable fix into main nfsd branch
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; |