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

Commit e895bd79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Here's my usual Sunday push, just for one revert which PeterZ hollered
  about after last weeks push.  Other than that, all seems strangely
  quiet as far as fixes go in non-platform ARM land at the moment."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  Revert "ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus"
parents 205b9c9c 3cd88f99

arch/arm/kernel/smp_twd.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -118,14 +118,10 @@ static int twd_cpufreq_transition(struct notifier_block *nb, 
	 * The twd clock events must be reprogrammed to account for the new

	 * The twd clock events must be reprogrammed to account for the new

	 * frequency.  The timer is local to a cpu, so cross-call to the

	 * frequency.  The timer is local to a cpu, so cross-call to the

	 * changing cpu.

	 * changing cpu.

	 *

	 * Only wait for it to finish, if the cpu is active to avoid

	 * deadlock when cpu1 is spinning on while(!cpu_active(cpu1)) during

	 * booting of that cpu.

	 */

	 */

	if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE)

	if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE)

		smp_call_function_single(freqs->cpu, twd_update_frequency,

		smp_call_function_single(freqs->cpu, twd_update_frequency,

					 NULL, cpu_active(freqs->cpu));

			NULL, 1);





	return NOTIFY_OK;

	return NOTIFY_OK;

}

}