diff options
author | Alexander Shishkin <alexander.shishkin@linux.intel.com> | 2015-06-04 09:31:47 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-04 10:07:51 -0400 |
commit | b44a2b53becf2485f484bd6bb6c1d963ebc339f8 (patch) | |
tree | 7a1ed19bff59b6268b4777d52ba48718ebcc9bdc /arch/x86 | |
parent | 68ab747604da98f0a0414f197f346ac22888fcee (diff) |
perf/x86/intel/pt: Fix a refactoring bug
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.
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reported-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c index 5b804f96ad66..123ff1bb2f60 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_pt.c +++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c | |||
@@ -151,7 +151,7 @@ static int __init pt_pmu_hw_init(void) | |||
151 | 151 | ||
152 | de_attr->attr.attr.name = pt_caps[i].name; | 152 | de_attr->attr.attr.name = pt_caps[i].name; |
153 | 153 | ||
154 | sysfs_attr_init(&de_attrs->attr.attr); | 154 | sysfs_attr_init(&de_attr->attr.attr); |
155 | 155 | ||
156 | de_attr->attr.attr.mode = S_IRUGO; | 156 | de_attr->attr.attr.mode = S_IRUGO; |
157 | de_attr->attr.show = pt_cap_show; | 157 | de_attr->attr.show = pt_cap_show; |