aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-record.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-10-08 11:43:00 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-10-08 11:43:00 -0400
commite3c55d406bd8df1a878546002c93db90c42be10c (patch)
treeefb0ba2707c95fd7166cf1b76887c43c977e37dd /tools/perf/builtin-record.c
parent4d6e482675f13e33599fc3d18fc723959be0a9b6 (diff)
parentd0e639c9e06d44e713170031fe05fb60ebe680af (diff)
Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were committed through other trees.
Diffstat (limited to 'tools/perf/builtin-record.c')
-rw-r--r--tools/perf/builtin-record.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index ecca62e27b28..a41ac41546c9 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -474,13 +474,6 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
474 goto out_delete_session; 474 goto out_delete_session;
475 } 475 }
476 476
477 err = perf_event__synthesize_event_types(tool, process_synthesized_event,
478 machine);
479 if (err < 0) {
480 pr_err("Couldn't synthesize event_types.\n");
481 goto out_delete_session;
482 }
483
484 if (have_tracepoints(&evsel_list->entries)) { 477 if (have_tracepoints(&evsel_list->entries)) {
485 /* 478 /*
486 * FIXME err <= 0 here actually means that 479 * FIXME err <= 0 here actually means that
@@ -904,7 +897,6 @@ const struct option record_options[] = {
904int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) 897int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
905{ 898{
906 int err = -ENOMEM; 899 int err = -ENOMEM;
907 struct perf_evsel *pos;
908 struct perf_evlist *evsel_list; 900 struct perf_evlist *evsel_list;
909 struct perf_record *rec = &record; 901 struct perf_record *rec = &record;
910 char errbuf[BUFSIZ]; 902 char errbuf[BUFSIZ];
@@ -968,11 +960,6 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
968 if (perf_evlist__create_maps(evsel_list, &rec->opts.target) < 0) 960 if (perf_evlist__create_maps(evsel_list, &rec->opts.target) < 0)
969 usage_with_options(record_usage, record_options); 961 usage_with_options(record_usage, record_options);
970 962
971 list_for_each_entry(pos, &evsel_list->entries, node) {
972 if (perf_header__push_event(pos->attr.config, perf_evsel__name(pos)))
973 goto out_free_fd;
974 }
975
976 if (rec->opts.user_interval != ULLONG_MAX) 963 if (rec->opts.user_interval != ULLONG_MAX)
977 rec->opts.default_interval = rec->opts.user_interval; 964 rec->opts.default_interval = rec->opts.user_interval;
978 if (rec->opts.user_freq != UINT_MAX) 965 if (rec->opts.user_freq != UINT_MAX)