diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-08 10:55:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-08 10:55:48 +0100 |
commit | 93c08089c06da402394605223b4faa73fe3730d2 (patch) | |
tree | 77d033546c3172a6d09d85b50005213f1d4884de /arch/x86/include/asm/inat.h | |
parent | 9275b933d409d3a4efa08102ca813557b93fb0b9 (diff) | |
parent | 71271269ef9a997fb4416b2f8ef3558dd846c7cb (diff) | |
download | op-kernel-dev-93c08089c06da402394605223b4faa73fe3730d2.zip op-kernel-dev-93c08089c06da402394605223b4faa73fe3730d2.tar.gz |
Merge branch 'x86/mpx' into x86/asm, to pick up dependent commits
The UMIP series is based on top of changes already queued up in the x86/mpx branch,
so merge it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/inat.h')
-rw-r--r-- | arch/x86/include/asm/inat.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/include/asm/inat.h b/arch/x86/include/asm/inat.h index 02aff08..1c78580 100644 --- a/arch/x86/include/asm/inat.h +++ b/arch/x86/include/asm/inat.h @@ -97,6 +97,16 @@ #define INAT_MAKE_GROUP(grp) ((grp << INAT_GRP_OFFS) | INAT_MODRM) #define INAT_MAKE_IMM(imm) (imm << INAT_IMM_OFFS) +/* Identifiers for segment registers */ +#define INAT_SEG_REG_IGNORE 0 +#define INAT_SEG_REG_DEFAULT 1 +#define INAT_SEG_REG_CS 2 +#define INAT_SEG_REG_SS 3 +#define INAT_SEG_REG_DS 4 +#define INAT_SEG_REG_ES 5 +#define INAT_SEG_REG_FS 6 +#define INAT_SEG_REG_GS 7 + /* Attribute search APIs */ extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode); extern int inat_get_last_prefix_id(insn_byte_t last_pfx); |