summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/perf
diff options
context:
space:
mode:
authorDan Carpenter2017-08-11 22:05:41 +0200
committerMichael Ellerman2017-08-14 13:57:55 +0200
commitb3376dcc6c62452fe24e76d8fc35bb13eb7ee178 (patch)
tree7cea5b3269ec158803fd6901c6ca95f0359d5159 /arch/powerpc/perf
parentpowerpc/8xx: Fix two CONFIG_8xx left behind (diff)
downloadkernel-qcow2-linux-b3376dcc6c62452fe24e76d8fc35bb13eb7ee178.tar.gz
kernel-qcow2-linux-b3376dcc6c62452fe24e76d8fc35bb13eb7ee178.tar.xz
kernel-qcow2-linux-b3376dcc6c62452fe24e76d8fc35bb13eb7ee178.zip
powerpc/perf: Fix double unlock in imc_common_cpuhp_mem_free()
This function is not called with the nest_init_lock held, and it also unlocks the nest_init_lock immediately below, so it's fairly clear that this is a typo and should be locking the lock. Fixes: 885dcd709ba9 ("powerpc/perf: Add nest IMC PMU support") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/perf')
-rw-r--r--arch/powerpc/perf/imc-pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
index 46cd912af060..52017f6eafd9 100644
--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -1124,7 +1124,7 @@ static void cleanup_all_thread_imc_memory(void)
static void imc_common_cpuhp_mem_free(struct imc_pmu *pmu_ptr)
{
if (pmu_ptr->domain == IMC_DOMAIN_NEST) {
- mutex_unlock(&nest_init_lock);
+ mutex_lock(&nest_init_lock);
if (nest_pmus == 1) {
cpuhp_remove_state(CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE);
kfree(nest_imc_refc);