diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-29 16:03:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-29 16:03:48 +0200 |
| commit | 2d074918fb1568f398777343ff9a28049fb86337 (patch) | |
| tree | 84277c1471f6d575a9515d42a53345666addabc8 /kernel/trace/trace_probe.h | |
| parent | 78282bec4b4a02a13b87d01fbe529396d37db926 (diff) | |
| parent | f67b15037a7a50c57f72e69a6d59941ad90a0f0f (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
kernel/events/hw_breakpoint.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_probe.h')
| -rw-r--r-- | kernel/trace/trace_probe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 0745f895f780..75daff22ccea 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -365,7 +365,7 @@ extern int traceprobe_conflict_field_name(const char *name, extern void traceprobe_update_arg(struct probe_arg *arg); extern void traceprobe_free_probe_arg(struct probe_arg *arg); -extern int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset); +extern int traceprobe_split_symbol_offset(char *symbol, long *offset); /* Sum up total data length for dynamic arraies (strings) */ static nokprobe_inline int |