4.4-stable patches

added patches:
	tty-vt-consw-con_scrolldelta-cleanup.patch

diff --git a/queue-4.4/mips-add-the-missing-cpu_1074k-into-__get_cpu_type.patch b/queue-4.4/mips-add-the-missing-cpu_1074k-into-__get_cpu_type.patch
index bb6f3d7cb5e0c7c53dbb1c725c0918f942d7775f..19649df0babdec8a8f8c47822e474fc750a094fd 100644 (file)
--- a/queue-4.4/mips-add-the-missing-cpu_1074k-into-__get_cpu_type.patch
+++ b/queue-4.4/mips-add-the-missing-cpu_1074k-into-__get_cpu_type.patch
@@ -16,14 +16,12 @@ Signed-off-by: Wei Li <liwei391@huawei.com>
 Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/mips/include/asm/cpu-type.h | 1 +
+ arch/mips/include/asm/cpu-type.h |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
-index abee2bfd10dc1..cea0bbb71590f 100644
 --- a/arch/mips/include/asm/cpu-type.h
 +++ b/arch/mips/include/asm/cpu-type.h
-@@ -46,6 +46,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
+@@ -46,6 +46,7 @@ static inline int __pure __get_cpu_type(
        case CPU_34K:
        case CPU_1004K:
        case CPU_74K:
@@ -31,6 +29,3 @@ index abee2bfd10dc1..cea0bbb71590f 100644
        case CPU_M14KC:
        case CPU_M14KEC:
        case CPU_INTERAPTIV:
--- 
-2.25.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index d6aabced642ce1458f17b35ed2b77cd748b1afa6..5c57d5878d8c70cb281c52b0f699cfb5e915d012 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -80,3 +80,4 @@ atm-eni-fix-the-missed-pci_disable_device-for-eni_in.patch
 batman-adv-mcast-tt-fix-wrongly-dropped-or-rerouted-.patch
 alsa-asihpi-fix-iounmap-in-error-handler.patch
 mips-add-the-missing-cpu_1074k-into-__get_cpu_type.patch
+tty-vt-consw-con_scrolldelta-cleanup.patch

diff --git a/queue-4.4/tty-vt-consw-con_scrolldelta-cleanup.patch b/queue-4.4/tty-vt-consw-con_scrolldelta-cleanup.patch
new file mode 100644 (file)
index 0000000..f351aba
--- /dev/null
+++ b/queue-4.4/tty-vt-consw-con_scrolldelta-cleanup.patch
@@ -0,0 +1,44 @@
+From 97293de977365fe672daec2523e66ef457104921 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jirislaby@kernel.org>
+Date: Thu, 23 Jun 2016 13:34:26 +0200
+Subject: tty: vt, consw->con_scrolldelta cleanup
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+commit 97293de977365fe672daec2523e66ef457104921 upstream.
+
+* allow NULL consw->con_scrolldelta (some consoles define an empty
+  hook)
+* => remove empty hooks now
+* return value of consw->con_scrolldelta is never checked => make the
+  function void
+* document consw->con_scrolldelta a bit
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Cc: Thomas Winischhofer <thomas@winischhofer.net>
+Cc: linux-usb@vger.kernel.org
+Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
+Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
+Cc: Helge Deller <deller@gmx.de>
+Cc: linux-fbdev@vger.kernel.org
+Cc: linux-parisc@vger.kernel.org
+Cc: Ajay Kaher <akaher@vmware.com>
+[ for 4.4.y backport, only do the first change above, to prevent
+.con_scrolldelta from being called if not present - gregkh]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/vt/vt.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
+@@ -2484,7 +2484,7 @@ static void console_callback(struct work
+       if (scrollback_delta) {
+               struct vc_data *vc = vc_cons[fg_console].d;
+               clear_selection();
+-              if (vc->vc_mode == KD_TEXT)
++              if (vc->vc_mode == KD_TEXT && vc->vc_sw->con_scrolldelta)
+                       vc->vc_sw->con_scrolldelta(vc, scrollback_delta);
+               scrollback_delta = 0;
+       }