Merge branch 'perf/urgent' into perf/core
Conflicts: tools/perf/builtin-record.c tools/perf/builtin-top.c tools/perf/perf.h tools/perf/util/top.h Merge reason: resolve these cherry-picking conflicts. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -1866,6 +1866,12 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
|
||||
tev->point.symbol);
|
||||
ret = -ENOENT;
|
||||
goto error;
|
||||
} else if (tev->point.offset > sym->end - sym->start) {
|
||||
pr_warning("Offset specified is greater than size of %s\n",
|
||||
tev->point.symbol);
|
||||
ret = -ENOENT;
|
||||
goto error;
|
||||
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
Reference in New Issue
Block a user