* [PATCH] perf tools: Fix include paths in ui
@ 2019-09-04 18:00 Ian Rogers
2019-09-04 18:07 ` Ian Rogers
0 siblings, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2019-09-04 18:00 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Andi Kleen,
linux-kernel
Cc: Stephane Eranian, Ian Rogers
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.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/ui/browser.c | 9 +++++----
tools/perf/ui/tui/progress.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index f80c51d53565..d227d74b28f8 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -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>
diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
index bc134b82829d..5a24dd3ce4db 100644
--- a/tools/perf/ui/tui/progress.c
+++ b/tools/perf/ui/tui/progress.c
@@ -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"
--
2.22.0.770.g0f2c4a37fd-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf tools: Fix include paths in ui
2019-09-04 18:00 [PATCH] perf tools: Fix include paths in ui Ian Rogers
@ 2019-09-04 18:07 ` Ian Rogers
0 siblings, 0 replies; 4+ messages in thread
From: Ian Rogers @ 2019-09-04 18:07 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Andi Kleen, LKML
Cc: Stephane Eranian
Apologies, this was an accidental resend of a patch that's already
merged fa37bab6d7154658d8a35920513f9396587754cc.
Ian
On Wed, Sep 4, 2019 at 11:01 AM Ian Rogers <irogers@google.com> wrote:
>
> 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.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/ui/browser.c | 9 +++++----
> tools/perf/ui/tui/progress.c | 2 +-
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
> index f80c51d53565..d227d74b28f8 100644
> --- a/tools/perf/ui/browser.c
> +++ b/tools/perf/ui/browser.c
> @@ -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>
>
> diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
> index bc134b82829d..5a24dd3ce4db 100644
> --- a/tools/perf/ui/tui/progress.c
> +++ b/tools/perf/ui/tui/progress.c
> @@ -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"
> --
> 2.22.0.770.g0f2c4a37fd-goog
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf tools: Fix include paths in ui
2019-07-31 22:54 Ian Rogers
@ 2019-08-08 13:39 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-08-08 13:39 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Andi Kleen, linux-kernel, Stephane Eranian
Em Wed, Jul 31, 2019 at 03:54:41PM -0700, Ian Rogers 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 point to the correct location without -I flags.
Thanks, applied.
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/ui/browser.c | 9 +++++----
> tools/perf/ui/tui/progress.c | 2 +-
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
> index f80c51d53565..d227d74b28f8 100644
> --- a/tools/perf/ui/browser.c
> +++ b/tools/perf/ui/browser.c
> @@ -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>
>
> diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
> index bc134b82829d..5a24dd3ce4db 100644
> --- a/tools/perf/ui/tui/progress.c
> +++ b/tools/perf/ui/tui/progress.c
> @@ -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"
> --
> 2.22.0.770.g0f2c4a37fd-goog
--
- Arnaldo
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] perf tools: Fix include paths in ui
@ 2019-07-31 22:54 Ian Rogers
2019-08-08 13:39 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2019-07-31 22:54 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Andi Kleen,
linux-kernel
Cc: Stephane Eranian, Ian Rogers
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.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/ui/browser.c | 9 +++++----
tools/perf/ui/tui/progress.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index f80c51d53565..d227d74b28f8 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -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>
diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
index bc134b82829d..5a24dd3ce4db 100644
--- a/tools/perf/ui/tui/progress.c
+++ b/tools/perf/ui/tui/progress.c
@@ -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"
--
2.22.0.770.g0f2c4a37fd-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-04 18:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-04 18:00 [PATCH] perf tools: Fix include paths in ui Ian Rogers
2019-09-04 18:07 ` Ian Rogers
-- strict thread matches above, loose matches on Subject: below --
2019-07-31 22:54 Ian Rogers
2019-08-08 13:39 ` Arnaldo Carvalho de Melo
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.