From: Jiri Slaby <jslaby@suse.cz>
Subject: kABI: x86/msr: Remove .fixup usage
Patch-mainline: never, kabi
References: kabi
Commit d52a7344bdfa (x86/msr: Remove .fixup usage) reshuffled with
extable constants (while adding two new). This broke kabi for already
built modules.
So unshuffle the constants to the original numbering and add the 2 new
ones to the end.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/x86/include/asm/extable_fixup_types.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- a/arch/x86/include/asm/extable_fixup_types.h
+++ b/arch/x86/include/asm/extable_fixup_types.h
@@ -32,16 +32,16 @@
#define EX_TYPE_COPY 4
#define EX_TYPE_CLEAR_FS 5
#define EX_TYPE_FPU_RESTORE 6
-#define EX_TYPE_BPF 7
-#define EX_TYPE_WRMSR 8
-#define EX_TYPE_RDMSR 9
-#define EX_TYPE_WRMSR_SAFE 10 /* reg := -EIO */
-#define EX_TYPE_RDMSR_SAFE 11 /* reg := -EIO */
-#define EX_TYPE_WRMSR_IN_MCE 12
-#define EX_TYPE_RDMSR_IN_MCE 13
-#define EX_TYPE_DEFAULT_MCE_SAFE 14
-#define EX_TYPE_FAULT_MCE_SAFE 15
-#define EX_TYPE_IMM_REG 17 /* reg := (long)imm */
+#define EX_TYPE_WRMSR 7
+#define EX_TYPE_RDMSR 8
+#define EX_TYPE_BPF 9
+#define EX_TYPE_WRMSR_IN_MCE 10
+#define EX_TYPE_RDMSR_IN_MCE 11
+#define EX_TYPE_DEFAULT_MCE_SAFE 12
+#define EX_TYPE_FAULT_MCE_SAFE 13
+#define EX_TYPE_IMM_REG 15 /* reg := (long)imm */
+#define EX_TYPE_WRMSR_SAFE 16 /* reg := -EIO */
+#define EX_TYPE_RDMSR_SAFE 17 /* reg := -EIO */
#define EX_TYPE_EFAULT_REG (EX_TYPE_IMM_REG | EX_DATA_IMM(-EFAULT))