diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-14 01:24:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-14 01:26:17 -0500 |
| commit | a356d2ae50790f49858ebed35da9e206336fafee (patch) | |
| tree | ca98b328e42398532440f45e2e226f7b45302e80 | |
| parent | 050ab10a645097e47c01cfab3ccf24167e9b266b (diff) | |
tools/headers: Sync objtool UAPI header
objtool grew this new warning:
Warning: synced file at 'tools/objtool/arch/x86/include/asm/inat.h' differs from latest kernel version at 'arch/x86/include/asm/inat.h'
which upstream header grew new INAT_SEG_* definitions.
Sync up the tooling version of the header.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/objtool/arch/x86/include/asm/inat.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/objtool/arch/x86/include/asm/inat.h b/tools/objtool/arch/x86/include/asm/inat.h index 02aff0867211..1c78580e58be 100644 --- a/tools/objtool/arch/x86/include/asm/inat.h +++ b/tools/objtool/arch/x86/include/asm/inat.h | |||
| @@ -97,6 +97,16 @@ | |||
| 97 | #define INAT_MAKE_GROUP(grp) ((grp << INAT_GRP_OFFS) | INAT_MODRM) | 97 | #define INAT_MAKE_GROUP(grp) ((grp << INAT_GRP_OFFS) | INAT_MODRM) |
| 98 | #define INAT_MAKE_IMM(imm) (imm << INAT_IMM_OFFS) | 98 | #define INAT_MAKE_IMM(imm) (imm << INAT_IMM_OFFS) |
| 99 | 99 | ||
| 100 | /* Identifiers for segment registers */ | ||
| 101 | #define INAT_SEG_REG_IGNORE 0 | ||
| 102 | #define INAT_SEG_REG_DEFAULT 1 | ||
| 103 | #define INAT_SEG_REG_CS 2 | ||
| 104 | #define INAT_SEG_REG_SS 3 | ||
| 105 | #define INAT_SEG_REG_DS 4 | ||
| 106 | #define INAT_SEG_REG_ES 5 | ||
| 107 | #define INAT_SEG_REG_FS 6 | ||
| 108 | #define INAT_SEG_REG_GS 7 | ||
| 109 | |||
| 100 | /* Attribute search APIs */ | 110 | /* Attribute search APIs */ |
| 101 | extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode); | 111 | extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode); |
| 102 | extern int inat_get_last_prefix_id(insn_byte_t last_pfx); | 112 | extern int inat_get_last_prefix_id(insn_byte_t last_pfx); |
