From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752095AbbH1Ggv (ORCPT ); Fri, 28 Aug 2015 02:36:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54588 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbbH1Ggt (ORCPT ); Fri, 28 Aug 2015 02:36:49 -0400 Date: Thu, 27 Aug 2015 23:36:33 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com Reply-To: tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, hpa@zytor.com In-Reply-To: <55D77696.60102@intel.com> References: <55D77696.60102@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix tarball build broken by pt/bts Git-Commit-ID: 5839a5506de30c23d4cfaf49755cd294f5c48368 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5839a5506de30c23d4cfaf49755cd294f5c48368 Gitweb: http://git.kernel.org/tip/5839a5506de30c23d4cfaf49755cd294f5c48368 Author: Adrian Hunter AuthorDate: Fri, 21 Aug 2015 22:05:58 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Sat, 22 Aug 2015 12:27:07 -0300 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 Signed-off-by: Adrian Hunter Cc: Jiri Olsa Link: http://lkml.kernel.org/r/55D77696.60102@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/intel-pt-decoder/inat.c | 2 +- tools/perf/util/intel-pt-decoder/inat.h | 2 +- .../x86/include/asm => tools/perf/util/intel-pt-decoder}/inat_types.h | 0 tools/perf/util/intel-pt-decoder/insn.c | 4 ++-- tools/perf/util/intel-pt-decoder/insn.h | 2 +- tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/intel-pt-decoder/inat.c b/tools/perf/util/intel-pt-decoder/inat.c index feeaa50..906d94a 100644 --- a/tools/perf/util/intel-pt-decoder/inat.c +++ b/tools/perf/util/intel-pt-decoder/inat.c @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -#include +#include "insn.h" /* Attribute tables are generated from opcode map */ #include "inat-tables.c" diff --git a/tools/perf/util/intel-pt-decoder/inat.h b/tools/perf/util/intel-pt-decoder/inat.h index 74a2e31..611645e 100644 --- a/tools/perf/util/intel-pt-decoder/inat.h +++ b/tools/perf/util/intel-pt-decoder/inat.h @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -#include +#include "inat_types.h" /* * Internal bits. Don't use bitmasks directly, because these bits are diff --git a/arch/x86/include/asm/inat_types.h b/tools/perf/util/intel-pt-decoder/inat_types.h similarity index 100% copy from arch/x86/include/asm/inat_types.h copy to tools/perf/util/intel-pt-decoder/inat_types.h diff --git a/tools/perf/util/intel-pt-decoder/insn.c b/tools/perf/util/intel-pt-decoder/insn.c index 8f72b33..47314a6 100644 --- a/tools/perf/util/intel-pt-decoder/insn.c +++ b/tools/perf/util/intel-pt-decoder/insn.c @@ -23,8 +23,8 @@ #else #include #endif -#include -#include +#include "inat.h" +#include "insn.h" /* Verify next sizeof(t) bytes can be on the same instruction */ #define validate_next(t, insn, n) \ diff --git a/tools/perf/util/intel-pt-decoder/insn.h b/tools/perf/util/intel-pt-decoder/insn.h index e7814b7..dd12da0 100644 --- a/tools/perf/util/intel-pt-decoder/insn.h +++ b/tools/perf/util/intel-pt-decoder/insn.h @@ -21,7 +21,7 @@ */ /* insn_attr_t is defined in inat.h */ -#include +#include "inat.h" struct insn_field { union { diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c index 46980fc..9e4eb8f 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c @@ -20,7 +20,7 @@ #include "event.h" -#include +#include "insn.h" #include "inat.c" #include "insn.c"