perf tools: Move sample data structures from perf.h

Into util/event.h header where all sample data structures
are defined.

Acked-by: Arnaldo Carvalho de Melo <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Corey Ashford <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Jiri Olsa <[email protected]>

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 1bf95374a7d651e0c6fef5c926a8855bcc4bba6a..cf8f2281ad8528f4ccae1039432a3d4094d74351 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -214,30 +214,6 @@ sys_perf_event_open(struct perf_event_attr *attr,
 
 #define MAX_NR_CPUS                    256
 
-struct ip_callchain {
-       u64 nr;
-       u64 ips[0];
-};
-
-struct branch_flags {
-       u64 mispred:1;
-       u64 predicted:1;
-       u64 in_tx:1;
-       u64 abort:1;
-       u64 reserved:60;
-};
-
-struct branch_entry {
-       u64                             from;
-       u64                             to;
-       struct branch_flags flags;
-};
-
-struct branch_stack {
-       u64                             nr;
-       struct branch_entry     entries[0];
-};
-
 extern const char *input_name;
 extern bool perf_host, perf_guest;
 extern const char perf_version_string[];

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 38457d447a13106360fb60d7b93dd3eab5217f50..d970232cb270cf5f3e5590a42798175e9cb2ad9e 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -112,6 +112,30 @@ struct sample_read {
        };
 };
 
+struct ip_callchain {
+       u64 nr;
+       u64 ips[0];
+};
+
+struct branch_flags {
+       u64 mispred:1;
+       u64 predicted:1;
+       u64 in_tx:1;
+       u64 abort:1;
+       u64 reserved:60;
+};
+
+struct branch_entry {
+       u64                     from;
+       u64                     to;
+       struct branch_flags     flags;
+};
+
+struct branch_stack {
+       u64                     nr;
+       struct branch_entry     entries[0];
+};
+
 struct perf_sample {
        u64 ip;
        u32 pid, tid;

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index ae94e006a52dd09ee1a3a871bbcd49afa2147558..33ede53fa6b9944940bec3047ec1789c375f11a0 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -12,6 +12,7 @@
 #include <byteswap.h>
 #include <libgen.h>
 #include "build-id.h"
+#include "event.h"
 
 #ifdef HAVE_LIBELF_SUPPORT
 #include <libelf.h>