diff options
| author | Ingo Molnar | 2017-02-14 07:29:14 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-02-14 07:29:14 +0100 |
| commit | 210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6 (patch) | |
| tree | 2098a7db539f0e92676d8d953002db3cc8eb03b8 /kernel/trace/trace_kprobe.c | |
| parent | perf/x86/intel: Add Kaby Lake support (diff) | |
| parent | Linux 4.10-rc8 (diff) | |
| download | kernel-qcow2-linux-210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6.tar.gz kernel-qcow2-linux-210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6.tar.xz kernel-qcow2-linux-210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6.zip | |
Merge tag 'v4.10-rc8' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_kprobe.c')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index a133ecd741e4..7ad9e53ad174 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1372,7 +1372,7 @@ kprobe_trace_selftest_target(int a1, int a2, int a3, int a4, int a5, int a6) return a1 + a2 + a3 + a4 + a5 + a6; } -static struct __init trace_event_file * +static __init struct trace_event_file * find_trace_probe_file(struct trace_kprobe *tk, struct trace_array *tr) { struct trace_event_file *file; |