Merge branch 'linus' into perf/core, to fix conflicts

[linux-2.6-microblaze.git] / tools / perf / util / jit.h

diff --git a/tools/perf/util/jit.h b/tools/perf/util/jit.h
index a1e99da..6817ffc 100644 (file)
--- a/tools/perf/util/jit.h
+++ b/tools/perf/util/jit.h
@@ -1,15 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __JIT_H__
 #define __JIT_H__
 
 #include <data.h>
 
-extern int jit_process(struct perf_session *session,
-                      struct perf_data_file *output,
-                      struct machine *machine,
-                      char *filename,
-                      pid_t pid,
-                      u64 *nbytes);
+int jit_process(struct perf_session *session, struct perf_data *output,
+               struct machine *machine, char *filename, pid_t pid, u64 *nbytes);
 
-extern int jit_inject_record(const char *filename);
+int jit_inject_record(const char *filename);
 
 #endif /* __JIT_H__ */