Skip to contentSkip to conversation

perf tools: Fix paths in include statements

PATCH Applied Luke Mujica 3 participants 3 messages Jul 19, 2019 – Aug 15, 2019 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 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(-)
tools/perf/arch/x86/util/kvm-stat.c +2 -2
index 865a9762f22e..3f84403c0983 100644
@@ -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>
tools/perf/arch/x86/util/tsc.c +3 -3
index 950539f9a4f7..b1eb963b4a6e 100644
@@ -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)
tools/perf/ui/helpline.c +2 -2
index b3c421429ed4..54bcd08df87e 100644
@@ -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];
 
tools/perf/ui/util.c +1 -1
index 63bf06e80ab9..9ed76e88a3e4 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "util.h"
-#include "../debug.h"
+#include "../util/debug.h"
 
 
 /*
Signature · 1 line
2.22.0.657.g960e92d24f-goog
#1 lore raw

Em Fri, Jul 19, 2019 at 01:22:53PM -0700, Luke Mujica escreveu:

Quoted 4 lines

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

Quoted 71 lines
---
 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(-)
tools/perf/arch/x86/util/kvm-stat.c +2 -2
index 865a9762f22e..3f84403c0983 100644
@@ -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>
tools/perf/arch/x86/util/tsc.c +3 -3
index 950539f9a4f7..b1eb963b4a6e 100644
@@ -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)
tools/perf/ui/helpline.c +2 -2
index b3c421429ed4..54bcd08df87e 100644
@@ -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];
 
tools/perf/ui/util.c +1 -1
index 63bf06e80ab9..9ed76e88a3e4 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "util.h"
-#include "../debug.h"
+#include "../util/debug.h"
 
 
 /*
Signature · 1 line
2.22.0.657.g960e92d24f-goog
Signature · 1 line
- Arnaldo
#2 lore raw
In reply to Luke Mujica
perf tools: Fix paths in include statements
Commit-ID:  2b75863b0845764529e01014a5c90664d8044cbe
Gitweb:     https://git.kernel.org/tip/2b75863b0845764529e01014a5c90664d8044cbe
Author:     Luke Mujica <[email protected]>
AuthorDate: Fri, 19 Jul 2019 13:22:53 -0700
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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.

---
 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(-)
tools/perf/arch/x86/util/kvm-stat.c +2 -2
index 54a3f2373c35..81b531a707bf 100644
@@ -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>
tools/perf/arch/x86/util/tsc.c +3 -3
index 950539f9a4f7..b1eb963b4a6e 100644
@@ -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)
tools/perf/ui/helpline.c +2 -2
index b3c421429ed4..54bcd08df87e 100644
@@ -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];
 
tools/perf/ui/util.c +1 -1
index 63bf06e80ab9..9ed76e88a3e4 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "util.h"
-#include "../debug.h"
+#include "../util/debug.h"
 
 
 /*