diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 17:13:25 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 17:13:25 +0400 |
| commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
| tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /tools/perf/util/evsel.c | |
| parent | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b (diff) | |
| parent | a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61 (diff) | |
| download | linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.xz | |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
Diffstat (limited to 'tools/perf/util/evsel.c')
| -rw-r--r-- | tools/perf/util/evsel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 667f3b78bb2c..7132ee834e0e 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -463,6 +463,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, memset(data, 0, sizeof(*data)); data->cpu = data->pid = data->tid = -1; data->stream_id = data->id = data->time = -1ULL; + data->period = 1; if (event->header.type != PERF_RECORD_SAMPLE) { if (!sample_id_all) |