[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-b44a2b53becf2485f484bd6bb6c1d963ebc339f8@git.kernel.org>
Date: Thu, 4 Jun 2015 07:14:31 -0700
From: tip-bot for Alexander Shishkin <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, linux-kernel@...r.kernel.org,
torvalds@...ux-foundation.org, tglx@...utronix.de,
alexander.shishkin@...ux.intel.com, tvrtko.ursulin@...ux.intel.com,
imre.deak@...el.com, akpm@...ux-foundation.org, mingo@...nel.org,
hpa@...or.com
Subject: [tip:perf/urgent] perf/x86/intel/pt: Fix a refactoring bug
Commit-ID: b44a2b53becf2485f484bd6bb6c1d963ebc339f8
Gitweb: http://git.kernel.org/tip/b44a2b53becf2485f484bd6bb6c1d963ebc339f8
Author: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
AuthorDate: Thu, 4 Jun 2015 16:31:47 +0300
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 4 Jun 2015 16:07:51 +0200
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@...ux.intel.com>
Reported-by: Imre Deak <imre.deak@...el.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: <linux-kernel@...r.kernel.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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 5b804f9..123ff1b 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)
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;
de_attr->attr.show = pt_cap_show;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists