remove queue-3.3/arm-7359-2-smp_twd-only-wait-for-reprogramming-on-active-cpus.patch

diff --git a/queue-3.3/arm-7359-2-smp_twd-only-wait-for-reprogramming-on-active-cpus.patch b/queue-3.3/arm-7359-2-smp_twd-only-wait-for-reprogramming-on-active-cpus.patch
deleted file mode 100644 (file)
index b835b87..0000000
--- a/queue-3.3/arm-7359-2-smp_twd-only-wait-for-reprogramming-on-active-cpus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9f85550347f51c79a917b2aec04c90691c11e20a Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Tue, 10 Apr 2012 12:37:42 +0100
-Subject: ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-commit 9f85550347f51c79a917b2aec04c90691c11e20a upstream.
-
-During booting of cpu1, there is a short window where cpu1
-is online, but not active where cpu1 is occupied by waiting
-to become active. If cpu0 then decides to schedule something
-on cpu1 and wait for it to complete, before cpu0 has set
-cpu1 active, we have a deadlock.
-
-Typically it's this CPU frequency transition that happens at
-this time, so let's just not wait for it to happen, it will
-happen whenever the CPU eventually comes online instead.
-
-Cc: Peter Zijlstra <peterz@infradead.org>
-Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
-Reviewed-by: Rickard Andersson <rickard.andersson@stericsson.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/kernel/smp_twd.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/arch/arm/kernel/smp_twd.c
-+++ b/arch/arm/kernel/smp_twd.c
-@@ -115,10 +115,14 @@ static int twd_cpufreq_transition(struct
-        * 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, 1);
-+                                       NULL, cpu_active(freqs->cpu));
- 
-       return NOTIFY_OK;
- }

diff --git a/queue-3.3/series b/queue-3.3/series
index e0b6b0d392d774373b2ab57eabb2714c083a4421..0050aed73cc17d98e16c1486ca38c2678891d356 100644 (file)
--- a/queue-3.3/series
+++ b/queue-3.3/series
@@ -7,7 +7,6 @@ drm-i915-properly-compute-dp-dithering-for-user-created-modes.patch
 drm-i915-make-rc6-module-parameter-read-only.patch
 rtlwifi-preallocate-usb-read-buffers-and-eliminate-kalloc-in-read-routine.patch
 rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch
-arm-7359-2-smp_twd-only-wait-for-reprogramming-on-active-cpus.patch
 arm-7379-1-dt-fix-atags_to_fdt-second-call-site.patch
 arm-7384-1-thumbee-disable-userspace-teehbr-access-for-config_arm_thumbee.patch
 md-raid1-raid10-fix-calculation-of-vcnt-when-processing-error-recovery.patch