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

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / event.h

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index c53f36384b64532abec852c9e6d7a496a0d982a6..f729df5e25e634607f6b4c2f2cb4cc4e1ec933a3 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -134,7 +134,8 @@ struct branch_flags {
        u64 predicted:1;
        u64 in_tx:1;
        u64 abort:1;
-       u64 reserved:60;
+       u64 cycles:16;
+       u64 reserved:44;
 };
 
 struct branch_entry {
@@ -348,6 +349,12 @@ struct itrace_start_event {
        u32 pid, tid;
 };
 
+struct context_switch_event {
+       struct perf_event_header header;
+       u32 next_prev_pid;
+       u32 next_prev_tid;
+};
+
 union perf_event {
        struct perf_event_header        header;
        struct mmap_event               mmap;
@@ -369,6 +376,7 @@ union perf_event {
        struct auxtrace_error_event     auxtrace_error;
        struct aux_event                aux;
        struct itrace_start_event       itrace_start;
+       struct context_switch_event     context_switch;
 };
 
 void perf_event__print_totals(void);
@@ -418,6 +426,10 @@ int perf_event__process_itrace_start(struct perf_tool *tool,
                                     union perf_event *event,
                                     struct perf_sample *sample,
                                     struct machine *machine);
+int perf_event__process_switch(struct perf_tool *tool,
+                              union perf_event *event,
+                              struct perf_sample *sample,
+                              struct machine *machine);
 int perf_event__process_mmap(struct perf_tool *tool,
                             union perf_event *event,
                             struct perf_sample *sample,
@@ -480,6 +492,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_task(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_itrace_start(union perf_event *event, FILE *fp);
+size_t perf_event__fprintf_switch(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf(union perf_event *event, FILE *fp);
 
 u64 kallsyms__get_function_start(const char *kallsyms_filename,