x86: Merge INAT_REXPFX into INAT_PFX_*

Merge INAT_REXPFX into INAT_PFX_* macro and rename it to
INAT_PFX_REX.

Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
LKML-Reference: <20091027204211.30545.58090.stgit@harusame>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/tools/gen-insn-attr-x86.awk b/arch/x86/tools/gen-insn-attr-x86.awk
index 19ba096b7dd1..7d5492951e22 100644
--- a/arch/x86/tools/gen-insn-attr-x86.awk
+++ b/arch/x86/tools/gen-insn-attr-x86.awk
@@ -278,7 +278,7 @@ function convert_operands(opnd,       i,imm,mod)
 
                 # check REX prefix
                 if (match(opcode, rex_expr))
-                        flags = add_flags(flags, "INAT_REXPFX")
+                        flags = add_flags(flags, "INAT_MAKE_PREFIX(INAT_PFX_REX)")
 
                 # check coprocessor escape : TODO
                 if (match(opcode, fpu_expr))
@@ -316,7 +316,7 @@ END {
         # print escape opcode map's array
         print "/* Escape opcode map array */"
         print "const insn_attr_t const *inat_escape_tables[INAT_ESC_MAX + 1]" \
-              "[INAT_LPREFIX_MAX + 1] = {"
+              "[INAT_LSTPFX_MAX + 1] = {"
         for (i = 0; i < geid; i++)
                 for (j = 0; j < max_lprefix; j++)
                         if (etable[i,j])
@@ -325,7 +325,7 @@ END {
         # print group opcode map's array
         print "/* Group opcode map array */"
         print "const insn_attr_t const *inat_group_tables[INAT_GRP_MAX + 1]"\
-              "[INAT_LPREFIX_MAX + 1] = {"
+              "[INAT_LSTPFX_MAX + 1] = {"
         for (i = 0; i < ggid; i++)
                 for (j = 0; j < max_lprefix; j++)
                         if (gtable[i,j])