summaryrefslogtreecommitdiffstats
path: root/tools/perf/tests/python-use.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-03 11:30:36 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-03 11:30:36 +0100
commit03e075b38e6cd25267c8d6e2797fa4537ca3348d (patch)
tree608ece74f1b3cca290e3408a29cf73e822f0ef4d /tools/perf/tests/python-use.c
parent753b11ef8e92a1c1bbe97f2a5ec14bdd1ef2e6fe (diff)
parent34229b277480f46c1e9a19f027f30b074512e68b (diff)
downloadcachepc-linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.tar.gz
cachepc-linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.zip
Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests/python-use.c')
-rw-r--r--tools/perf/tests/python-use.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/tests/python-use.c b/tools/perf/tests/python-use.c
index 7760277c6def..7a52834ee0d0 100644
--- a/tools/perf/tests/python-use.c
+++ b/tools/perf/tests/python-use.c
@@ -4,11 +4,12 @@
#include <stdio.h>
#include <stdlib.h>
+#include <linux/compiler.h>
#include "tests.h"
extern int verbose;
-int test__python_use(void)
+int test__python_use(int subtest __maybe_unused)
{
char *cmd;
int ret;