Skip to contentSkip to conversation

Patch "perf pmu: Fix misleadingly indented assignment (whitespace)" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 13, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

perf pmu: Fix misleadingly indented assignment (whitespace)

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-pmu-fix-misleadingly-indented-assignment-whitespace.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d85ce830eef6c10d1e9617172dea4681f02b8424 Mon Sep 17 00:00:00 2001

From: Markus Trippelsdorf <[email protected]>
Date: Mon, 14 Dec 2015 16:44:40 +0100
Subject: perf pmu: Fix misleadingly indented assignment (whitespace)

From: Markus Trippelsdorf <[email protected]>

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)
    ^~
Cc Ben Hutchings <[email protected]>
Cc Matt Fleming <[email protected]>
Cc Peter Zijlstra <[email protected]>
Fixes 410136f5dd96 ("tools/perf/stat: Add event unit and scale support")
---
 tools/perf/util/pmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/pmu.c +1 -1
@@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct p
 	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;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/perf-tests-remove-wrong-semicolon-in-while-loop-in-cqm-test.patch queue-4.4/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing-focussed.patch queue-4.4/x86-tools-fix-gcc-7-warning-in-relocs.c.patch queue-4.4/perf-pmu-fix-misleadingly-indented-assignment-whitespace.patch