Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus

[karo-tx-linux.git] / tools / perf / util / event.h

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index b7ffb7ee9971f020f1b2320baa478ed1421a01e9..6bb1c928350d414f8cc157c1c1a608ab4ac6c8ee 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -192,6 +192,7 @@ struct perf_sample {
        u64 data_src;
        u32 flags;
        u16 insn_len;
+       u8  cpumode;
        void *raw_data;
        struct ip_callchain *callchain;
        struct branch_stack *branch_stack;
@@ -597,10 +598,8 @@ int perf_event__process(struct perf_tool *tool,
 
 struct addr_location;
 
-int perf_event__preprocess_sample(const union perf_event *event,
-                                 struct machine *machine,
-                                 struct addr_location *al,
-                                 struct perf_sample *sample);
+int machine__resolve(struct machine *machine, struct addr_location *al,
+                    struct perf_sample *sample);
 
 void addr_location__put(struct addr_location *al);
 
@@ -608,10 +607,8 @@ struct thread;
 
 bool is_bts_event(struct perf_event_attr *attr);
 bool sample_addr_correlates_sym(struct perf_event_attr *attr);
-void perf_event__preprocess_sample_addr(union perf_event *event,
-                                       struct perf_sample *sample,
-                                       struct thread *thread,
-                                       struct addr_location *al);
+void thread__resolve(struct thread *thread, struct addr_location *al,
+                    struct perf_sample *sample);
 
 const char *perf_event__name(unsigned int id);