Em Mon, Dec 15, 2014 at 08:20:34PM +0530, Naveen N. Rao escreveu:
> Fix up various perf aspects related to ppc64's usage of dot functions:
> - ignore leading '.' when generating event names and when looking for
> existing events.
> - use the proper prefix when ignoring SyS symbol lookups.
>
> Signed-off-by: Naveen N. Rao <[email protected]>
> ---
> tools/perf/util/probe-event.c | 8 ++++++++
> tools/perf/util/symbol.c | 6 ++++++
> 2 files changed, 14 insertions(+)
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index 9943ff3..74b7fef 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2080,6 +2080,10 @@ static int get_new_event_name(char *buf, size_t len,
> const char *base,
> {
> int i, ret;
>
> + /* Skip the leading dot on powerpc */
> + if (*base == '.')
> + base++;
> +
> /* Try no suffix */
> ret = e_snprintf(buf, len, "%s", base);
> if (ret < 0) {
> @@ -2538,6 +2542,10 @@ int del_perf_probe_events(struct strlist *dellist)
> event = str;
> }
>
> + /* Skip the leading dot on powerpc */
Ok, but this is not powerpc specific code, is it?
> + if (event && *event == '.')
> + event++;
> +
> ret = e_snprintf(buf, 128, "%s:%s", group, event);
> if (ret < 0) {
> pr_err("Failed to copy event.");
> diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
> index c24c5b8..e7b9bae 100644
> --- a/tools/perf/util/symbol.c
> +++ b/tools/perf/util/symbol.c
> @@ -139,6 +139,12 @@ static int choose_best_symbol(struct symbol *syma,
> struct symbol *symb)
> if (na >= 10 && !strncmp(syma->name, "compat_SyS", 10))
> return SYMBOL_B;
>
> + /* On powerpc, ignore the dot variants */
> + if (na >= 4 && !strncmp(syma->name, ".SyS", 4))
> + return SYMBOL_B;
> + if (na >= 11 && !strncmp(syma->name, ".compat_SyS", 11))
> + return SYMBOL_B;
> +
> return SYMBOL_A;
> }
>
> --
> 2.1.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
