(2010/12/25 17:58), tip-bot for Franck Bui-Huu wrote:
> Commit-ID: 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee
> Gitweb: http://git.kernel.org/tip/32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee
> Author: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
> AuthorDate: Wed, 22 Dec 2010 17:37:13 +0100
> Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> CommitDate: Wed, 22 Dec 2010 20:32:08 -0200
>
> perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen
>
> This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850.
>
It's a good fix for me.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
> Cc: H. Peter Anvin <hpa@xxxxxxxxx>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> LKML-Reference: <m3y67hsr0m.fsf@xxxxxxxxx>
> Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> ---
> tools/perf/util/probe-event.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index 099336e..4bde988 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -309,7 +309,7 @@ static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)
> return 1;
> error:
> if (ferror(fp)) {
> - pr_warning("Source file is shorter than expected.\n");
> + pr_warning("File read error: %s\n", strerror(errno));
> return -1;
> }
> return 0;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Masami HIRAMATSU
2nd Dept. Linux Technology Center
Hitachi, Ltd., Systems Development Laboratory
E-mail: masami.hiramatsu.pt@xxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|