Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / tools / perf / util / branch.h

diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h
index 1e3c7c5..64f96b7 100644 (file)
--- a/tools/perf/util/branch.h
+++ b/tools/perf/util/branch.h
@@ -1,8 +1,31 @@
 #ifndef _PERF_BRANCH_H
 #define _PERF_BRANCH_H 1
 
+#include <stdio.h>
 #include <stdint.h>
-#include "../perf.h"
+#include <linux/perf_event.h>
+#include <linux/types.h>
+
+struct branch_flags {
+       u64 mispred:1;
+       u64 predicted:1;
+       u64 in_tx:1;
+       u64 abort:1;
+       u64 cycles:16;
+       u64 type:4;
+       u64 reserved:40;
+};
+
+struct branch_entry {
+       u64                     from;
+       u64                     to;
+       struct branch_flags     flags;
+};
+
+struct branch_stack {
+       u64                     nr;
+       struct branch_entry     entries[0];
+};
 
 struct branch_type_stat {
        bool    branch_to;
@@ -13,8 +36,6 @@ struct branch_type_stat {
        u64     cross_2m;
 };
 
-struct branch_flags;
-
 void branch_type_count(struct branch_type_stat *st, struct branch_flags *flags,
                       u64 from, u64 to);