diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 11:43:00 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 11:43:00 -0400 |
| commit | e3c55d406bd8df1a878546002c93db90c42be10c (patch) | |
| tree | efb0ba2707c95fd7166cf1b76887c43c977e37dd /tools/perf/python/twatch.py | |
| parent | 4d6e482675f13e33599fc3d18fc723959be0a9b6 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (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/python/twatch.py')
| -rwxr-xr-x | tools/perf/python/twatch.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/python/twatch.py b/tools/perf/python/twatch.py index b11cca584238..2225162ee1fc 100755 --- a/tools/perf/python/twatch.py +++ b/tools/perf/python/twatch.py | |||
| @@ -21,7 +21,7 @@ def main(): | |||
| 21 | evsel = perf.evsel(task = 1, comm = 1, mmap = 0, | 21 | evsel = perf.evsel(task = 1, comm = 1, mmap = 0, |
| 22 | wakeup_events = 1, watermark = 1, | 22 | wakeup_events = 1, watermark = 1, |
| 23 | sample_id_all = 1, | 23 | sample_id_all = 1, |
| 24 | sample_type = perf.SAMPLE_PERIOD | perf.SAMPLE_TID | perf.SAMPLE_CPU | perf.SAMPLE_TID) | 24 | sample_type = perf.SAMPLE_PERIOD | perf.SAMPLE_TID | perf.SAMPLE_CPU) |
| 25 | evsel.open(cpus = cpus, threads = threads); | 25 | evsel.open(cpus = cpus, threads = threads); |
| 26 | evlist = perf.evlist(cpus, threads) | 26 | evlist = perf.evlist(cpus, threads) |
| 27 | evlist.add(evsel) | 27 | evlist.add(evsel) |