Merge "msm-core: Fix race with userspace updating power numbers" (82892856) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qcom/msm-core.c

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -397,6 +397,7 @@ static int update_userspace_power(struct sched_params __user *argp)
		/* Copy the same power values for all the cpus in the cpumask
		* argp->cpumask within the cluster (argp->cluster)
		*/
		spin_lock(&update_lock);
		cpumask = argp->cpumask;
		for (i = 0; i < MAX_CORES_PER_CLUSTER; i++, cpumask >>= 1) {
		if (!(cpumask & 0x01))
		@@ -419,6 +420,7 @@ static int update_userspace_power(struct sched_params __user *argp)
		repopulate_stats(cpu);
		}
		}
		spin_unlock(&update_lock);

		activate_power_table = true;
		return 0;