diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-10-06 12:48:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-06 12:49:21 +0200 |
| commit | 9d014020234525ae100879d71078a4bcb4849195 (patch) | |
| tree | a0d6c0776670cb876e5a8118a4e6ed28d8f51cbc /tools/perf/builtin-record.c | |
| parent | perf: Fix counter of ftrace events (diff) | |
| parent | Linux 3.1-rc9 (diff) | |
| download | linux-dev-9d014020234525ae100879d71078a4bcb4849195.tar.xz linux-dev-9d014020234525ae100879d71078a4bcb4849195.zip | |
Merge commit 'v3.1-rc9' into perf/core
Merge reason: pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 042117f8fffa..dd6467872f60 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -174,6 +174,7 @@ static void config_attr(struct perf_evsel *evsel, struct perf_evlist *evlist) struct perf_event_attr *attr = &evsel->attr; int track = !evsel->idx; /* only the first counter needs these */ + attr->disabled = 1; attr->inherit = !no_inherit; attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | PERF_FORMAT_TOTAL_TIME_RUNNING | @@ -686,6 +687,8 @@ static int __cmd_record(int argc, const char **argv) } } + perf_evlist__enable(evsel_list); + /* * Let the child rip */ |