Skip to contentSkip to conversation

perf tools: Fix include paths in ui

PATCH Applied Ian Rogers 3 participants 3 messages Jul 31, 2019 – Aug 8, 2019 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf tools: Fix include paths in ui

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 point to the correct location without -I flags.

---
 tools/perf/ui/browser.c      | 9 +++++----
 tools/perf/ui/tui/progress.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
tools/perf/ui/browser.c +5 -4
index f80c51d53565..d227d74b28f8 100644
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "../string2.h"
-#include "../config.h"
-#include "../../perf.h"
+#include "../util/util.h"
+#include "../util/string2.h"
+#include "../util/config.h"
+#include "../perf.h"
 #include "libslang.h"
 #include "ui.h"
 #include "util.h"
@@ -14,7 +15,7 @@
 #include "browser.h"
 #include "helpline.h"
 #include "keysyms.h"
-#include "../color.h"
+#include "../util/color.h"
 #include <linux/ctype.h>
 #include <linux/zalloc.h>
 
tools/perf/ui/tui/progress.c +1 -1
index bc134b82829d..5a24dd3ce4db 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
-#include "../cache.h"
+#include "../../util/cache.h"
 #include "../progress.h"
 #include "../libslang.h"
 #include "../ui.h"
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
#1 lore raw

Em Wed, Jul 31, 2019 at 03:54:41PM -0700, Ian Rogers escreveu:

Quoted 3 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 point to the correct location without -I flags.

Thanks, applied.

- Arnaldo

Quoted 45 lines
---
 tools/perf/ui/browser.c      | 9 +++++----
 tools/perf/ui/tui/progress.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
tools/perf/ui/browser.c +5 -4
index f80c51d53565..d227d74b28f8 100644
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "../string2.h"
-#include "../config.h"
-#include "../../perf.h"
+#include "../util/util.h"
+#include "../util/string2.h"
+#include "../util/config.h"
+#include "../perf.h"
 #include "libslang.h"
 #include "ui.h"
 #include "util.h"
@@ -14,7 +15,7 @@
 #include "browser.h"
 #include "helpline.h"
 #include "keysyms.h"
-#include "../color.h"
+#include "../util/color.h"
 #include <linux/ctype.h>
 #include <linux/zalloc.h>
 
tools/perf/ui/tui/progress.c +1 -1
index bc134b82829d..5a24dd3ce4db 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
-#include "../cache.h"
+#include "../../util/cache.h"
 #include "../progress.h"
 #include "../libslang.h"
 #include "../ui.h"
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Signature · 1 line
- Arnaldo
#2 lore raw

[tip:perf/urgent] perf tools: Fix include paths in ui directory

In reply to Ian Rogers
perf tools: Fix include paths in ui directory
Commit-ID:  fa37bab6d7154658d8a35920513f9396587754cc
Gitweb:     https://git.kernel.org/tip/fa37bab6d7154658d8a35920513f9396587754cc
Author:     Ian Rogers <[email protected]>
AuthorDate: Wed, 31 Jul 2019 15:54:41 -0700
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 8 Aug 2019 15:41:11 -0300

perf tools: Fix include paths in ui directory

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 point to the correct location without -I flags.

---
 tools/perf/ui/browser.c      | 9 +++++----
 tools/perf/ui/tui/progress.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
tools/perf/ui/browser.c +5 -4
index f80c51d53565..d227d74b28f8 100644
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "../string2.h"
-#include "../config.h"
-#include "../../perf.h"
+#include "../util/util.h"
+#include "../util/string2.h"
+#include "../util/config.h"
+#include "../perf.h"
 #include "libslang.h"
 #include "ui.h"
 #include "util.h"
@@ -14,7 +15,7 @@
 #include "browser.h"
 #include "helpline.h"
 #include "keysyms.h"
-#include "../color.h"
+#include "../util/color.h"
 #include <linux/ctype.h>
 #include <linux/zalloc.h>
 
tools/perf/ui/tui/progress.c +1 -1
index bc134b82829d..5a24dd3ce4db 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
-#include "../cache.h"
+#include "../../util/cache.h"
 #include "../progress.h"
 #include "../libslang.h"
 #include "../ui.h"