aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2015-06-13 19:09:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-21 13:10:03 -0400
commit16e860b30b2c3703d92a6cd701a6e602d897f481 (patch)
treef2f0be1055e19a71667e42b8272fa909b5286c57 /arch
parent3e43ff498fb1a9f8a58c7746c207b8ffd9a9a87d (diff)
arc: fix use of uninitialized arc_pmu
commit 7002f77541f877a5590615ceb3da32b114f14b62 upstream. static arc_pmu in the arch/arc/kernel/perf_event.c is not initialized as it's shadowed by a local variable of the same name in the arc_pmu_device_probe. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Fixes: 03c94fcf954d "ARC: perf: make @arc_pmu static global" Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arc/kernel/perf_event.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index fd2ec50102f2..57b58f52d825 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -266,7 +266,6 @@ static int arc_pmu_add(struct perf_event *event, int flags)
266 266
267static int arc_pmu_device_probe(struct platform_device *pdev) 267static int arc_pmu_device_probe(struct platform_device *pdev)
268{ 268{
269 struct arc_pmu *arc_pmu;
270 struct arc_reg_pct_build pct_bcr; 269 struct arc_reg_pct_build pct_bcr;
271 struct arc_reg_cc_build cc_bcr; 270 struct arc_reg_cc_build cc_bcr;
272 int i, j, ret; 271 int i, j, ret;