Merge branch 'linus' into perf/core, to fix conflicts

[linux-2.6-microblaze.git] / tools / perf / builtin-mem.c

diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 4db9600..5065646 100644 (file)
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -113,6 +113,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
                if (!perf_mem_events[j].supported) {
                        pr_err("failed: event '%s' not supported\n",
                               perf_mem_events__name(j));
+                       free(rec_argv);
                        return -1;
                }
 
@@ -236,13 +237,15 @@ static int process_sample_event(struct perf_tool *tool,
 
 static int report_raw_events(struct perf_mem *mem)
 {
-       struct perf_data_file file = {
-               .path = input_name,
-               .mode = PERF_DATA_MODE_READ,
-               .force = mem->force,
+       struct perf_data data = {
+               .file      = {
+                       .path = input_name,
+               },
+               .mode      = PERF_DATA_MODE_READ,
+               .force     = mem->force,
        };
        int ret;
-       struct perf_session *session = perf_session__new(&file, false,
+       struct perf_session *session = perf_session__new(&data, false,
                                                         &mem->tool);
 
        if (session == NULL)