diff options
author | Mark Brown | 2017-09-19 15:12:47 +0200 |
---|---|---|
committer | Mark Brown | 2017-09-19 15:12:47 +0200 |
commit | e9331ee9b164d58b4dd0abc882ba7e23d2f404b3 (patch) | |
tree | 903d078e53a59ed65708193f2486ad0b9a8109d8 /tools/perf/tests/bp_signal.c | |
parent | ASoC: rockchip: Add dapm route for HDMI (diff) | |
parent | Linux 4.14-rc1 (diff) | |
download | kernel-qcow2-linux-e9331ee9b164d58b4dd0abc882ba7e23d2f404b3.tar.gz kernel-qcow2-linux-e9331ee9b164d58b4dd0abc882ba7e23d2f404b3.tar.xz kernel-qcow2-linux-e9331ee9b164d58b4dd0abc882ba7e23d2f404b3.zip |
Merge tag 'v4.14-rc1' into asoc-rockchip
Linux 4.14-rc1
Diffstat (limited to 'tools/perf/tests/bp_signal.c')
-rw-r--r-- | tools/perf/tests/bp_signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c index 39bbb97cd30a..97937e1bc53a 100644 --- a/tools/perf/tests/bp_signal.c +++ b/tools/perf/tests/bp_signal.c @@ -164,7 +164,7 @@ static long long bp_count(int fd) return count; } -int test__bp_signal(int subtest __maybe_unused) +int test__bp_signal(struct test *test __maybe_unused, int subtest __maybe_unused) { struct sigaction sa; long long count1, count2, count3; |