summaryrefslogtreecommitdiffstats
path: root/tools/objtool/arch
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-02-09 20:18:21 +0100
committerIngo Molnar <mingo@kernel.org>2021-03-06 12:44:22 +0100
commitd473b18b2ef62563fb874f9cae6e123f99129e3f (patch)
tree8ca5734683216051f31cb101a5e1d5cd65da64d0 /tools/objtool/arch
parentobjtool: Allow UNWIND_HINT to suppress dodgy stack modifications (diff)
downloadlinux-d473b18b2ef62563fb874f9cae6e123f99129e3f.tar.xz
linux-d473b18b2ef62563fb874f9cae6e123f99129e3f.zip
objtool,x86: Renumber CFI_reg
Make them match the instruction encoding numbering. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Tested-by: Nick Desaulniers <ndesaulniers@google.com> Link: https://lkml.kernel.org/r/20210211173627.033720313@infradead.org
Diffstat (limited to 'tools/objtool/arch')
-rw-r--r--tools/objtool/arch/x86/include/arch/cfi_regs.h12
1 files 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 79bc517efba8..0579d22c433c 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