Commit 3cd88f99 authored Apr 19, 2012 by Russell King

Revert "ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus"

This reverts commit 9f855503.

Peter Zijlstra says:
| Argh, how did that ever make it upstream, please drop.
|
| Russell, please make that go away upstream.
|
| Like I said, this is both completely the wrong way to solve, and you're
| so not paying attention, see:
|
|   5fbd036b
|   2baab4e9
|   e3831edd
|
| What's even worse:
|
| git describe --contains 9f855503 --match "v*"
| v3.4-rc3~1^2~3
|
| that nonsense got merged long after those other commits.

Linus Walleij says:
| My bad, was because the initial patch was submitted march 9th before
| these fixes were merged:
| http://marc.info/?l=linux-arm-kernel&m=133159655513844&w=2


|
| It was pending for a while in Russell's patch tracker and I
| rebased it to -rc2 without paying enough attention to recent
| related scheduler fixes ... lesson learned.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 708e5978

arch/arm/kernel/smp_twd.c

+1 −5

Original line number	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
		* frequency. The timer is local to a cpu, so cross-call to the
		* 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)
		smp_call_function_single(freqs->cpu, twd_update_frequency,
		NULL, cpu_active(freqs->cpu));
		NULL, 1);

		return NOTIFY_OK;
		}