lkml.org 
[lkml]   [2016]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 205/218] perf pmu: Fix misleadingly indented assignment (whitespace)
    Date
    4.2.8-ckt7 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Markus Trippelsdorf <markus@trippelsdorf.de>

    commit d85ce830eef6c10d1e9617172dea4681f02b8424 upstream.

    One line in perf_pmu__parse_unit() is indented wrongly, leading to a
    warning (=> error) from gcc 6:

    util/pmu.c:156:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]

    sret = read(fd, alias->unit, UNIT_MAX_LEN);
    ^~~~

    util/pmu.c:153:2: note: ...this 'if' clause, but it is not
    if (fd == -1)
    ^~

    Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Acked-by: Ingo Molnar <mingo@kernel.org>
    Cc: Ben Hutchings <ben@decadent.org.uk>
    Cc: Matt Fleming <matt@codeblueprint.co.uk>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Fixes: 410136f5dd96 ("tools/perf/stat: Add event unit and scale support")
    Link: http://lkml.kernel.org/r/20151214154440.GC1409@x4
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    tools/perf/util/pmu.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
    index ca54a61..284ebd9 100644
    --- a/tools/perf/util/pmu.c
    +++ b/tools/perf/util/pmu.c
    @@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
    if (fd == -1)
    return -1;

    - sret = read(fd, alias->unit, UNIT_MAX_LEN);
    + sret = read(fd, alias->unit, UNIT_MAX_LEN);
    if (sret < 0)
    goto error;

    --
    2.7.4
    \
     
     \ /
      Last update: 2016-03-31 22:41    [W:4.196 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site