[PATCH] perf/x86/intel/pt: Fix a refactoring glitch

From: Alexander Shishkin
Date: Thu Jun 04 2015 - 09:34:08 EST


Commit 066450be41 ("perf/x86/intel/pt: Clean up the control flow in
pt_pmu_hw_init()") changed attribute initialization so that only the
first attribute gets initialized using sysfs_attr_init(), which upsets
lockdep.

This patch fixes the glitch so that all allocated attributes are properly
initialized thus fixing the lockdep warning reported by Tvrtko and Imre.

Signed-off-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>
Reported-by: Imre Deak <imre.deak@xxxxxxxxx>
---
arch/x86/kernel/cpu/perf_event_intel_pt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
index ccdda1311e..7ef69b2c46 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
@@ -197,7 +197,7 @@ static int __init pt_pmu_hw_init(void)

de_attr->attr.attr.name = pt_caps[i].name;

- sysfs_attr_init(&de_attrs->attr.attr);
+ sysfs_attr_init(&de_attr->attr.attr);

de_attr->attr.attr.mode = S_IRUGO | S_IWUSR;
de_attr->attr.store = pt_cap_store;
--
2.1.4

--
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/