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

[sfrench/cifs-2.6.git] / tools / perf / util / header.c

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 5af58aac91ad2b186079914809934acecdf34578..1ec1d9bc2d6356bf98d053aec68331c21142907a 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -279,8 +279,6 @@ static int do_read_bitmap(struct feat_fd *ff, unsigned long **pset, u64 *psize)
        if (!set)
                return -ENOMEM;
 
-       bitmap_zero(set, size);
-
        p = (u64 *) set;
 
        for (i = 0; (u64) i < BITS_TO_U64(size); i++) {
@@ -1285,7 +1283,6 @@ static int memory_node__read(struct memory_node *n, unsigned long idx)
                return -ENOMEM;
        }
 
-       bitmap_zero(n->set, size);
        n->node = idx;
        n->size = size;
 
@@ -3207,9 +3204,9 @@ static int read_attr(int fd, struct perf_header *ph,
 }
 
 static int perf_evsel__prepare_tracepoint_event(struct perf_evsel *evsel,
-                                               struct pevent *pevent)
+                                               struct tep_handle *pevent)
 {
-       struct event_format *event;
+       struct tep_event_format *event;
        char bf[128];
 
        /* already prepared */
@@ -3221,7 +3218,7 @@ static int perf_evsel__prepare_tracepoint_event(struct perf_evsel *evsel,
                return -1;
        }
 
-       event = pevent_find_event(pevent, evsel->attr.config);
+       event = tep_find_event(pevent, evsel->attr.config);
        if (event == NULL) {
                pr_debug("cannot find event format for %d\n", (int)evsel->attr.config);
                return -1;
@@ -3239,7 +3236,7 @@ static int perf_evsel__prepare_tracepoint_event(struct perf_evsel *evsel,
 }
 
 static int perf_evlist__prepare_tracepoint_events(struct perf_evlist *evlist,
-                                                 struct pevent *pevent)
+                                                 struct tep_handle *pevent)
 {
        struct perf_evsel *pos;
 
@@ -3451,10 +3448,10 @@ int perf_event__synthesize_features(struct perf_tool *tool,
        return ret;
 }
 
-int perf_event__process_feature(struct perf_tool *tool,
-                               union perf_event *event,
-                               struct perf_session *session __maybe_unused)
+int perf_event__process_feature(struct perf_session *session,
+                               union perf_event *event)
 {
+       struct perf_tool *tool = session->tool;
        struct feat_fd ff = { .fd = 0 };
        struct feature_event *fe = (struct feature_event *)event;
        int type = fe->header.type;
@@ -3640,13 +3637,13 @@ size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp)
 }
 
 int perf_event__synthesize_attrs(struct perf_tool *tool,
-                                  struct perf_session *session,
-                                  perf_event__handler_t process)
+                                struct perf_evlist *evlist,
+                                perf_event__handler_t process)
 {
        struct perf_evsel *evsel;
        int err = 0;
 
-       evlist__for_each_entry(session->evlist, evsel) {
+       evlist__for_each_entry(evlist, evsel) {
                err = perf_event__synthesize_attr(tool, &evsel->attr, evsel->ids,
                                                  evsel->id, process);
                if (err) {
@@ -3859,9 +3856,8 @@ int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd,
        return aligned_size;
 }
 
-int perf_event__process_tracing_data(struct perf_tool *tool __maybe_unused,
-                                    union perf_event *event,
-                                    struct perf_session *session)
+int perf_event__process_tracing_data(struct perf_session *session,
+                                    union perf_event *event)
 {
        ssize_t size_read, padding, size = event->tracing_data.size;
        int fd = perf_data__fd(session->data);
@@ -3927,9 +3923,8 @@ int perf_event__synthesize_build_id(struct perf_tool *tool,
        return err;
 }
 
-int perf_event__process_build_id(struct perf_tool *tool __maybe_unused,
-                                union perf_event *event,
-                                struct perf_session *session)
+int perf_event__process_build_id(struct perf_session *session,
+                                union perf_event *event)
 {
        __event_process_build_id(&event->build_id,
                                 event->build_id.filename,