The following commit has been merged into the objtool/core branch of tip: Commit-ID: d473b18b2ef62563fb874f9cae6e123f99129e3f Gitweb: https://git.kernel.org/tip/d473b18b2ef62563fb874f9cae6e123f99129e3f Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Tue, 09 Feb 2021 20:18:21 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Sat, 06 Mar 2021 12:44:22 +01:00 objtool,x86: Renumber CFI_reg Make them match the instruction encoding numbering. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Acked-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Tested-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20210211173627.033720313@xxxxxxxxxxxxx --- tools/objtool/arch/x86/include/arch/cfi_regs.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/objtool/arch/x86/include/arch/cfi_regs.h b/tools/objtool/arch/x86/include/arch/cfi_regs.h index 79bc517..0579d22 100644 --- a/tools/objtool/arch/x86/include/arch/cfi_regs.h +++ b/tools/objtool/arch/x86/include/arch/cfi_regs.h @@ -4,13 +4,13 @@ #define _OBJTOOL_CFI_REGS_H #define CFI_AX 0 -#define CFI_DX 1 -#define CFI_CX 2 +#define CFI_CX 1 +#define CFI_DX 2 #define CFI_BX 3 -#define CFI_SI 4 -#define CFI_DI 5 -#define CFI_BP 6 -#define CFI_SP 7 +#define CFI_SP 4 +#define CFI_BP 5 +#define CFI_SI 6 +#define CFI_DI 7 #define CFI_R8 8 #define CFI_R9 9 #define CFI_R10 10
|