summaryrefslogtreecommitdiffstats
path: root/tools/perf/tests
diff options
context:
space:
mode:
authorIngo Molnar2017-11-29 07:23:44 +0100
committerIngo Molnar2017-11-29 07:23:44 +0100
commite4f57147e4893344d9088bebf174c053353daec5 (patch)
treed703ae131cff09c8fab47079671261ed863eec94 /tools/perf/tests
parentMerge tag 'perf-core-for-mingo-4.15-20171117' of git://git.kernel.org/pub/scm... (diff)
parentMerge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff)
downloadkernel-qcow2-linux-e4f57147e4893344d9088bebf174c053353daec5.tar.gz
kernel-qcow2-linux-e4f57147e4893344d9088bebf174c053353daec5.tar.xz
kernel-qcow2-linux-e4f57147e4893344d9088bebf174c053353daec5.zip
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')
-rw-r--r--tools/perf/tests/task-exit.c4
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;