Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed...

[sfrench/cifs-2.6.git] / tools / arch / x86 / include / asm / insn.h

diff --git a/tools/arch/x86/include/asm/insn.h b/tools/arch/x86/include/asm/insn.h
index 37a4c390750bc0a0236a2a33836b3cf17888a54e..568854b14d0a57d49ac5d2eabfafa054cf66bec2 100644 (file)
--- a/tools/arch/x86/include/asm/insn.h
+++ b/tools/arch/x86/include/asm/insn.h
@@ -45,6 +45,7 @@ struct insn {
                struct insn_field immediate2;   /* for 64bit imm or seg16 */
        };
 
+       int     emulate_prefix_size;
        insn_attr_t attr;
        unsigned char opnd_bytes;
        unsigned char addr_bytes;
@@ -128,6 +129,11 @@ static inline int insn_is_evex(struct insn *insn)
        return (insn->vex_prefix.nbytes == 4);
 }
 
+static inline int insn_has_emulate_prefix(struct insn *insn)
+{
+       return !!insn->emulate_prefix_size;
+}
+
 /* Ensure this instruction is decoded completely */
 static inline int insn_complete(struct insn *insn)
 {