diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-16 22:11:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-16 22:11:55 -0500 |
| commit | c30abd5e40dd863f88e26be09b6ce949145a630a (patch) | |
| tree | 5b25362084308502a336d8da26b8dc7430d7c812 /drivers/bus/arm-cci.c | |
| parent | net: phy: broadcom: Add entry for 5395 switch PHYs (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff) | |
| download | wireguard-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.xz wireguard-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bus/arm-cci.c')
| -rw-r--r-- | drivers/bus/arm-cci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 3c29d36702a8..5426c04fe24b 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -1755,14 +1755,17 @@ static int cci_pmu_probe(struct platform_device *pdev) raw_spin_lock_init(&cci_pmu->hw_events.pmu_lock); mutex_init(&cci_pmu->reserve_mutex); atomic_set(&cci_pmu->active_events, 0); - cpumask_set_cpu(smp_processor_id(), &cci_pmu->cpus); + cpumask_set_cpu(get_cpu(), &cci_pmu->cpus); ret = cci_pmu_init(cci_pmu, pdev); - if (ret) + if (ret) { + put_cpu(); return ret; + } cpuhp_state_add_instance_nocalls(CPUHP_AP_PERF_ARM_CCI_ONLINE, &cci_pmu->node); + put_cpu(); pr_info("ARM %s PMU driver probed", cci_pmu->model->name); return 0; } |