diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-29 07:23:44 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-29 07:23:44 +0100 |
commit | e4f57147e4893344d9088bebf174c053353daec5 (patch) | |
tree | d703ae131cff09c8fab47079671261ed863eec94 /tools/perf/tests/task-exit.c | |
parent | 754fe00fa65d8877a006085900a11f6e37456380 (diff) | |
parent | 6e948c67c47211afcc65c9ccdeedbd5db5c57077 (diff) | |
download | linux-next-e4f57147e4893344d9088bebf174c053353daec5.tar.gz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests/task-exit.c')
-rw-r--r-- | tools/perf/tests/task-exit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c index 98c098475e71..5d06ac81f7f1 100644 --- a/tools/perf/tests/task-exit.c +++ b/tools/perf/tests/task-exit.c @@ -84,7 +84,11 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused evsel = perf_evlist__first(evlist); evsel->attr.task = 1; +#ifdef __s390x__ + evsel->attr.sample_freq = 1000000; +#else evsel->attr.sample_freq = 1; +#endif evsel->attr.inherit = 0; evsel->attr.watermark = 0; evsel->attr.wakeup_events = 1; |