diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-21 08:27:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-21 08:27:47 -0800 |
| commit | 1adce1b9440cdf0c427419b99bc9db756b5ad931 (patch) | |
| tree | c51091a2ed88c28a284bacec2d822018efd3d820 /tools/objtool | |
| parent | Merge tag 'edac_updates_for_v6.3' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | x86/static_call: Add support for Jcc tail-calls (diff) | |
| download | linux-1adce1b9440cdf0c427419b99bc9db756b5ad931.tar.gz linux-1adce1b9440cdf0c427419b99bc9db756b5ad931.zip | |
Merge tag 'x86_alternatives_for_v6.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm alternatives updates from Borislav Petkov:
- Teach the static_call patching infrastructure to handle conditional
tall calls properly which can be static calls too
- Add proper struct alt_instr.flags which controls different aspects of
insn patching behavior
* tag 'x86_alternatives_for_v6.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/static_call: Add support for Jcc tail-calls
x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions
x86/alternatives: Introduce int3_emulate_jcc()
x86/alternatives: Add alt_instr.flags
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/arch/x86/include/arch/special.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/objtool/arch/x86/include/arch/special.h b/tools/objtool/arch/x86/include/arch/special.h index f2918f789a0a..ca8131352994 100644 --- a/tools/objtool/arch/x86/include/arch/special.h +++ b/tools/objtool/arch/x86/include/arch/special.h @@ -11,11 +11,11 @@ #define JUMP_NEW_OFFSET 4 #define JUMP_KEY_OFFSET 8 -#define ALT_ENTRY_SIZE 12 +#define ALT_ENTRY_SIZE 14 #define ALT_ORIG_OFFSET 0 #define ALT_NEW_OFFSET 4 #define ALT_FEATURE_OFFSET 8 -#define ALT_ORIG_LEN_OFFSET 10 -#define ALT_NEW_LEN_OFFSET 11 +#define ALT_ORIG_LEN_OFFSET 12 +#define ALT_NEW_LEN_OFFSET 13 #endif /* _X86_ARCH_SPECIAL_H */ |