Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Fix tarball build broken by pt/bts

Fix some include paths and add missing inat_types.h.

Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/55D77696.60102@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Adrian Hunter and committed by
Arnaldo Carvalho de Melo
5839a550 0e53909a

+35 -6
+1 -1
tools/perf/util/intel-pt-decoder/inat.c
··· 18 18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 19 * 20 20 */ 21 - #include <asm/insn.h> 21 + #include "insn.h" 22 22 23 23 /* Attribute tables are generated from opcode map */ 24 24 #include "inat-tables.c"
+1 -1
tools/perf/util/intel-pt-decoder/inat.h
··· 20 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 21 * 22 22 */ 23 - #include <asm/inat_types.h> 23 + #include "inat_types.h" 24 24 25 25 /* 26 26 * Internal bits. Don't use bitmasks directly, because these bits are
+29
tools/perf/util/intel-pt-decoder/inat_types.h
··· 1 + #ifndef _ASM_X86_INAT_TYPES_H 2 + #define _ASM_X86_INAT_TYPES_H 3 + /* 4 + * x86 instruction attributes 5 + * 6 + * Written by Masami Hiramatsu <mhiramat@redhat.com> 7 + * 8 + * This program is free software; you can redistribute it and/or modify 9 + * it under the terms of the GNU General Public License as published by 10 + * the Free Software Foundation; either version 2 of the License, or 11 + * (at your option) any later version. 12 + * 13 + * This program is distributed in the hope that it will be useful, 14 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 + * GNU General Public License for more details. 17 + * 18 + * You should have received a copy of the GNU General Public License 19 + * along with this program; if not, write to the Free Software 20 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 + * 22 + */ 23 + 24 + /* Instruction attributes */ 25 + typedef unsigned int insn_attr_t; 26 + typedef unsigned char insn_byte_t; 27 + typedef signed int insn_value_t; 28 + 29 + #endif
+2 -2
tools/perf/util/intel-pt-decoder/insn.c
··· 23 23 #else 24 24 #include <string.h> 25 25 #endif 26 - #include <asm/inat.h> 27 - #include <asm/insn.h> 26 + #include "inat.h" 27 + #include "insn.h" 28 28 29 29 /* Verify next sizeof(t) bytes can be on the same instruction */ 30 30 #define validate_next(t, insn, n) \
+1 -1
tools/perf/util/intel-pt-decoder/insn.h
··· 21 21 */ 22 22 23 23 /* insn_attr_t is defined in inat.h */ 24 - #include <asm/inat.h> 24 + #include "inat.h" 25 25 26 26 struct insn_field { 27 27 union {
+1 -1
tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
··· 20 20 21 21 #include "event.h" 22 22 23 - #include <asm/insn.h> 23 + #include "insn.h" 24 24 25 25 #include "inat.c" 26 26 #include "insn.c"