* [PATCH] perf tools: Fix paths in include statements
@ 2019-07-19 20:22 Luke Mujica
2019-07-30 22:02 ` Arnaldo Carvalho de Melo
2019-08-15 9:19 ` [tip:perf/core] " tip-bot for Luke Mujica
0 siblings, 2 replies; 3+ messages in thread
From: Luke Mujica @ 2019-07-19 20:22 UTC (permalink / raw)
To: peterz, mingo, acme, alexander.shishkin, jolsa
Cc: linux-kernel, irogers, eranian, Luke Mujica
These paths point to the wrong location but still work because
they get picked up by a -I flag that happens to direct to the correct
file. Fix paths to lead to the actual file location without help from
include flags.
Signed-off-by: Luke Mujica <lukemujica@google.com>
---
tools/perf/arch/x86/util/kvm-stat.c | 4 ++--
tools/perf/arch/x86/util/tsc.c | 6 +++---
tools/perf/ui/helpline.c | 4 ++--
tools/perf/ui/util.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util/kvm-stat.c
index 865a9762f22e..3f84403c0983 100644
--- a/tools/perf/arch/x86/util/kvm-stat.c
+++ b/tools/perf/arch/x86/util/kvm-stat.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <errno.h>
-#include "../../util/kvm-stat.h"
-#include "../../util/evsel.h"
+#include "../../../util/kvm-stat.h"
+#include "../../../util/evsel.h"
#include <asm/svm.h>
#include <asm/vmx.h>
#include <asm/kvm.h>
diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c
index 950539f9a4f7..b1eb963b4a6e 100644
--- a/tools/perf/arch/x86/util/tsc.c
+++ b/tools/perf/arch/x86/util/tsc.c
@@ -5,10 +5,10 @@
#include <linux/stddef.h>
#include <linux/perf_event.h>
-#include "../../perf.h"
+#include "../../../perf.h"
#include <linux/types.h>
-#include "../../util/debug.h"
-#include "../../util/tsc.h"
+#include "../../../util/debug.h"
+#include "../../../util/tsc.h"
int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
struct perf_tsc_conversion *tc)
diff --git a/tools/perf/ui/helpline.c b/tools/perf/ui/helpline.c
index b3c421429ed4..54bcd08df87e 100644
--- a/tools/perf/ui/helpline.c
+++ b/tools/perf/ui/helpline.c
@@ -3,10 +3,10 @@
#include <stdlib.h>
#include <string.h>
-#include "../debug.h"
+#include "../util/debug.h"
#include "helpline.h"
#include "ui.h"
-#include "../util.h"
+#include "../util/util.h"
char ui_helpline__current[512];
diff --git a/tools/perf/ui/util.c b/tools/perf/ui/util.c
index 63bf06e80ab9..9ed76e88a3e4 100644
--- a/tools/perf/ui/util.c
+++ b/tools/perf/ui/util.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "util.h"
-#include "../debug.h"
+#include "../util/debug.h"
/*
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf tools: Fix paths in include statements
2019-07-19 20:22 [PATCH] perf tools: Fix paths in include statements Luke Mujica
@ 2019-07-30 22:02 ` Arnaldo Carvalho de Melo
2019-08-15 9:19 ` [tip:perf/core] " tip-bot for Luke Mujica
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-07-30 22:02 UTC (permalink / raw)
To: Luke Mujica
Cc: peterz, mingo, alexander.shishkin, jolsa, linux-kernel, irogers, eranian
Em Fri, Jul 19, 2019 at 01:22:53PM -0700, Luke Mujica escreveu:
> These paths point to the wrong location but still work because
> they get picked up by a -I flag that happens to direct to the correct
> file. Fix paths to lead to the actual file location without help from
> include flags.
Thanks, applied.
- Arnaldo
> Signed-off-by: Luke Mujica <lukemujica@google.com>
> ---
> tools/perf/arch/x86/util/kvm-stat.c | 4 ++--
> tools/perf/arch/x86/util/tsc.c | 6 +++---
> tools/perf/ui/helpline.c | 4 ++--
> tools/perf/ui/util.c | 2 +-
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util/kvm-stat.c
> index 865a9762f22e..3f84403c0983 100644
> --- a/tools/perf/arch/x86/util/kvm-stat.c
> +++ b/tools/perf/arch/x86/util/kvm-stat.c
> @@ -1,7 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <errno.h>
> -#include "../../util/kvm-stat.h"
> -#include "../../util/evsel.h"
> +#include "../../../util/kvm-stat.h"
> +#include "../../../util/evsel.h"
> #include <asm/svm.h>
> #include <asm/vmx.h>
> #include <asm/kvm.h>
> diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c
> index 950539f9a4f7..b1eb963b4a6e 100644
> --- a/tools/perf/arch/x86/util/tsc.c
> +++ b/tools/perf/arch/x86/util/tsc.c
> @@ -5,10 +5,10 @@
> #include <linux/stddef.h>
> #include <linux/perf_event.h>
>
> -#include "../../perf.h"
> +#include "../../../perf.h"
> #include <linux/types.h>
> -#include "../../util/debug.h"
> -#include "../../util/tsc.h"
> +#include "../../../util/debug.h"
> +#include "../../../util/tsc.h"
>
> int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
> struct perf_tsc_conversion *tc)
> diff --git a/tools/perf/ui/helpline.c b/tools/perf/ui/helpline.c
> index b3c421429ed4..54bcd08df87e 100644
> --- a/tools/perf/ui/helpline.c
> +++ b/tools/perf/ui/helpline.c
> @@ -3,10 +3,10 @@
> #include <stdlib.h>
> #include <string.h>
>
> -#include "../debug.h"
> +#include "../util/debug.h"
> #include "helpline.h"
> #include "ui.h"
> -#include "../util.h"
> +#include "../util/util.h"
>
> char ui_helpline__current[512];
>
> diff --git a/tools/perf/ui/util.c b/tools/perf/ui/util.c
> index 63bf06e80ab9..9ed76e88a3e4 100644
> --- a/tools/perf/ui/util.c
> +++ b/tools/perf/ui/util.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "util.h"
> -#include "../debug.h"
> +#include "../util/debug.h"
>
>
> /*
> --
> 2.22.0.657.g960e92d24f-goog
--
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:perf/core] perf tools: Fix paths in include statements
2019-07-19 20:22 [PATCH] perf tools: Fix paths in include statements Luke Mujica
2019-07-30 22:02 ` Arnaldo Carvalho de Melo
@ 2019-08-15 9:19 ` tip-bot for Luke Mujica
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Luke Mujica @ 2019-08-15 9:19 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, tglx, irogers, hpa, acme, alexander.shishkin,
jolsa, peterz, eranian, lukemujica, mingo
Commit-ID: 2b75863b0845764529e01014a5c90664d8044cbe
Gitweb: https://git.kernel.org/tip/2b75863b0845764529e01014a5c90664d8044cbe
Author: Luke Mujica <lukemujica@google.com>
AuthorDate: Fri, 19 Jul 2019 13:22:53 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 12 Aug 2019 16:26:02 -0300
perf tools: Fix paths in include statements
These paths point to the wrong location but still work because they get
picked up by a -I flag that happens to direct to the correct file. Fix
paths to lead to the actual file location without help from include
flags.
Signed-off-by: Luke Mujica <lukemujica@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20190719202253.220261-1-lukemujica@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/arch/x86/util/kvm-stat.c | 4 ++--
tools/perf/arch/x86/util/tsc.c | 6 +++---
tools/perf/ui/helpline.c | 4 ++--
tools/perf/ui/util.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util/kvm-stat.c
index 54a3f2373c35..81b531a707bf 100644
--- a/tools/perf/arch/x86/util/kvm-stat.c
+++ b/tools/perf/arch/x86/util/kvm-stat.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <errno.h>
-#include "../../util/kvm-stat.h"
-#include "../../util/evsel.h"
+#include "../../../util/kvm-stat.h"
+#include "../../../util/evsel.h"
#include <asm/svm.h>
#include <asm/vmx.h>
#include <asm/kvm.h>
diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c
index 950539f9a4f7..b1eb963b4a6e 100644
--- a/tools/perf/arch/x86/util/tsc.c
+++ b/tools/perf/arch/x86/util/tsc.c
@@ -5,10 +5,10 @@
#include <linux/stddef.h>
#include <linux/perf_event.h>
-#include "../../perf.h"
+#include "../../../perf.h"
#include <linux/types.h>
-#include "../../util/debug.h"
-#include "../../util/tsc.h"
+#include "../../../util/debug.h"
+#include "../../../util/tsc.h"
int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
struct perf_tsc_conversion *tc)
diff --git a/tools/perf/ui/helpline.c b/tools/perf/ui/helpline.c
index b3c421429ed4..54bcd08df87e 100644
--- a/tools/perf/ui/helpline.c
+++ b/tools/perf/ui/helpline.c
@@ -3,10 +3,10 @@
#include <stdlib.h>
#include <string.h>
-#include "../debug.h"
+#include "../util/debug.h"
#include "helpline.h"
#include "ui.h"
-#include "../util.h"
+#include "../util/util.h"
char ui_helpline__current[512];
diff --git a/tools/perf/ui/util.c b/tools/perf/ui/util.c
index 63bf06e80ab9..9ed76e88a3e4 100644
--- a/tools/perf/ui/util.c
+++ b/tools/perf/ui/util.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "util.h"
-#include "../debug.h"
+#include "../util/debug.h"
/*
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-15 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-19 20:22 [PATCH] perf tools: Fix paths in include statements Luke Mujica
2019-07-30 22:02 ` Arnaldo Carvalho de Melo
2019-08-15 9:19 ` [tip:perf/core] " tip-bot for Luke Mujica
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.