remove queue-3.14/tty-vt-fix-soft-lockup-in-fbcon-cursor-blink-timer.patch

diff --git a/queue-3.14/series b/queue-3.14/series
index 410881ec77221ff2987bad90d02a457762406179..1ed3b39f24e6436bc5cb1ec11c7edba177786cbf 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -41,7 +41,6 @@ iio-accel-kxsd9-fix-the-usage-of-spi_w8r8.patch
 iio-ad7266-fix-broken-regulator-error-handling.patch
 iio-ad7266-fix-support-for-optional-regulators.patch
 iio-ad7266-fix-probe-deferral-for-vref.patch
-tty-vt-fix-soft-lockup-in-fbcon-cursor-blink-timer.patch
 tty-vt-keyboard-fix-oob-access-in-do_compute_shiftstate.patch
 alsa-dummy-fix-a-use-after-free-at-closing.patch
 alsa-au88x0-fix-calculation-in-vortex_wtdma_bufshift.patch

diff --git a/queue-3.14/tty-vt-fix-soft-lockup-in-fbcon-cursor-blink-timer.patch b/queue-3.14/tty-vt-fix-soft-lockup-in-fbcon-cursor-blink-timer.patch
deleted file mode 100644 (file)
index c97b516..0000000
--- a/queue-3.14/tty-vt-fix-soft-lockup-in-fbcon-cursor-blink-timer.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1b45996d2ebf9680ccd0db875fc668aa025f40fd Mon Sep 17 00:00:00 2001
-From: David Daney <david.daney@cavium.com>
-Date: Tue, 17 May 2016 11:41:04 -0700
-Subject: tty: vt: Fix soft lockup in fbcon cursor blink timer.
-
-From: David Daney <david.daney@cavium.com>
-
-commit 1b45996d2ebf9680ccd0db875fc668aa025f40fd upstream.
-
-We are getting somewhat random soft lockups with this signature:
-
-[   86.992215] [<fffffc00080935e0>] el1_irq+0xa0/0x10c
-[   86.997082] [<fffffc000841822c>] cursor_timer_handler+0x30/0x54
-[   87.002991] [<fffffc000810ec44>] call_timer_fn+0x54/0x1a8
-[   87.008378] [<fffffc000810ef88>] run_timer_softirq+0x1c4/0x2bc
-[   87.014200] [<fffffc000809077c>] __do_softirq+0x114/0x344
-[   87.019590] [<fffffc00080af45c>] irq_exit+0x74/0x98
-[   87.024458] [<fffffc00080fac20>] __handle_domain_irq+0x98/0xfc
-[   87.030278] [<fffffc000809056c>] gic_handle_irq+0x94/0x190
-
-This is caused by the vt visual_init() function calling into
-fbcon_init() with a vc_cur_blink_ms value of zero.  This is a
-transient condition, as it is later set to a non-zero value.  But, if
-the timer happens to expire while the blink rate is zero, it goes into
-an endless loop, and we get soft lockup.
-
-The fix is to initialize vc_cur_blink_ms before calling the con_init()
-function.
-
-Signed-off-by: David Daney <david.daney@cavium.com>
-Acked-by: Pavel Machek <pavel@ucw.cz>
-Tested-by: Ming Lei <ming.lei@canonical.com>
-Acked-by: Scot Doyle <lkml14@scotdoyle.com>
-Tested-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/tty/vt/vt.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/tty/vt/vt.c
-+++ b/drivers/tty/vt/vt.c
-@@ -742,6 +742,7 @@ static void visual_init(struct vc_data *
-       vc->vc_complement_mask = 0;
-       vc->vc_can_do_color = 0;
-       vc->vc_panic_force_write = false;
-+      vc->vc_cur_blink_ms = DEFAULT_CURSOR_BLINK_MS;
-       vc->vc_sw->con_init(vc, init);
-       if (!vc->vc_complement_mask)
-               vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;