Merge tag 'driver-core-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / tools / perf / builtin-inject.c

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 8d1d13b9bab683b3bc068bc892ae8977e1010693..ea8db38eedd10a987534da2c81a1ca83cbb2109f 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -18,10 +18,13 @@
 #include "util/data.h"
 #include "util/auxtrace.h"
 #include "util/jit.h"
+#include "util/thread.h"
 
 #include <subcmd/parse-options.h>
 
 #include <linux/list.h>
+#include <errno.h>
+#include <signal.h>
 
 struct perf_inject {
        struct perf_tool        tool;
@@ -694,6 +697,8 @@ static int __cmd_inject(struct perf_inject *inject)
                lseek(fd, output_data_offset, SEEK_SET);
 
        ret = perf_session__process_events(session);
+       if (ret)
+               return ret;
 
        if (!file_out->is_pipe) {
                if (inject->build_ids)
@@ -738,7 +743,7 @@ static int __cmd_inject(struct perf_inject *inject)
        return ret;
 }
 
-int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
+int cmd_inject(int argc, const char **argv)
 {
        struct perf_inject inject = {
                .tool = {