Skip to contentSkip to conversation

perf debug: No need to include ui/util.h

tip: perf/urgent tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Sep 20, 2019 1 message not in the archive perf events

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     b22bb139dcb370cd3a7f3c5ae29d55bb69235ace
Gitweb:        https://git.kernel.org/tip/b22bb139dcb370cd3a7f3c5ae29d55bb69235ace
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Tue, 03 Sep 2019 09:57:50 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Fri, 20 Sep 2019 09:19:20 -03:00

perf debug: No need to include ui/util.h

Nothing from that file is used in util/debug.h, it is only needed in some places that get it indirectly via including util/debug.h, remove that entanglement.

---
 tools/perf/ui/browsers/scripts.c | 1 +
 tools/perf/ui/gtk/setup.c        | 3 ++-
 tools/perf/util/debug.h          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/scripts.c +1 -0
index 586a21a..3b81075 100644
@@ -2,6 +2,7 @@
 #include "../../builtin.h"
 #include "../../perf.h"
 #include "../../util/util.h"
+#include "../util.h"
 #include "../../util/hist.h"
 #include "../../util/debug.h"
 #include "../../util/symbol.h"
tools/perf/ui/gtk/setup.c +2 -1
index 1a2616b..f5eee4d 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "gtk.h"
-#include "../../util/debug.h"
+#include <linux/compiler.h>
+#include "../util.h"
 
 extern struct perf_error_ops perf_gtk_eops;
 
tools/perf/util/debug.h +1 -1
index b2deee9..d25ae1c 100644
@@ -3,9 +3,9 @@
 #ifndef __PERF_DEBUG_H
 #define __PERF_DEBUG_H
 
+#include <stdarg.h>
 #include <stdbool.h>
 #include <linux/compiler.h>
-#include "../ui/util.h"
 
 extern int verbose;
 extern bool quiet, dump_trace;