Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3be9dea1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: spm: Replace smp_processor_id call with get_cpu"

parents 61d15c3a 415326a0

arch/arm/mach-msm/spm_devices.c

+4 −1
Original line number Diff line number Diff line
@@ -82,12 +82,14 @@ int msm_spm_set_vdd(unsigned int cpu, unsigned int vlevel) 
{

	struct msm_spm_vdd_info info;

	int ret;

	int current_cpu;



	info.cpu = cpu;

	info.vlevel = vlevel;

	info.err = -ENODEV;



	if (!msm_spm_L2_apcs_master && (smp_processor_id() != cpu) &&

	current_cpu = get_cpu();

	if (!msm_spm_L2_apcs_master && (current_cpu != cpu) &&

			cpu_online(cpu)) {

		/**

		 * We do not want to set the voltage of another core from
@@ -109,6 +111,7 @@ int msm_spm_set_vdd(unsigned int cpu, unsigned int vlevel) 
		msm_spm_smp_set_vdd(&info);

		ret = info.err;

	}

	put_cpu();



	return ret;

}