Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932743AbcDHV6I (ORCPT ); Fri, 8 Apr 2016 17:58:08 -0400 Received: from foss.arm.com ([217.140.101.70]:41777 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759046AbcDHV5N (ORCPT ); Fri, 8 Apr 2016 17:57:13 -0400 From: Jeremy Linton To: linux-kernel@vger.kernel.org Cc: will.deacon@arm.com, mark.rutland@arm.com, peterz@infradead.org, mingo@redhat.com, catalin.marinas@arm.com, msalter@redhat.com, timur@codeaurora.org, nleeder@codeaurora.org, agustinv@codeaurora.org, sfr@canb.auug.org.au, Jeremy Linton Subject: [PATCH 1/4] arm: pmu: Fix non-devicetree probing Date: Fri, 8 Apr 2016 16:57:04 -0500 Message-Id: <1460152627-3248-2-git-send-email-jeremy.linton@arm.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1460152627-3248-1-git-send-email-jeremy.linton@arm.com> References: <1460152627-3248-1-git-send-email-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1037 Lines: 31 From: Mark Salter There is a problem in the non-devicetree PMU probing where some probe functions may get the number of supported events through smp_call_function_any() using the arm_pmu supported_cpus mask. But at the time the probe function is called, the supported_cpus mask is empty so the call fails. This patch makes sure the mask is set before calling the init function rather than after. Signed-off-by: Mark Salter Signed-off-by: Jeremy Linton --- drivers/perf/arm_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 32346b5..49fa845 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -997,8 +997,8 @@ int arm_pmu_device_probe(struct platform_device *pdev, if (!ret) ret = init_fn(pmu); } else { - ret = probe_current_pmu(pmu, probe_table); cpumask_setall(&pmu->supported_cpus); + ret = probe_current_pmu(pmu, probe_table); } if (ret) { -- 2.4.3