linux: update to 4.8.11, fix sparc32 invalid frame-pointer check

19 files changed, 34 insertions, 16 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 297bdea03..bda689686 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -16,10 +16,10 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_8),y)
-KERNEL_FILE_VER:=	4.8.6
+KERNEL_FILE_VER:=	4.8.11
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b
+KERNEL_HASH:=		cc0f42f408ba3e51f8b0e93e3d8050ff18569456d286cb2a1aca3327dd06890f
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y)
 KERNEL_FILE_VER:=	4.4.30
diff --git a/target/avr32/grasshopper/patches/4.8.6/0001-grasshopper.patch b/target/avr32/grasshopper/patches/4.8.11/0001-grasshopper.patch
index 0fa4535c2..0fa4535c2 100644
--- a/target/avr32/grasshopper/patches/4.8.6/0001-grasshopper.patch
+++ b/target/avr32/grasshopper/patches/4.8.11/0001-grasshopper.patch
diff --git a/target/avr32/grasshopper/patches/4.8.6/0002-grasshopper-led-pwm.patch b/target/avr32/grasshopper/patches/4.8.11/0002-grasshopper-led-pwm.patch
index 977c91523..977c91523 100644
--- a/target/avr32/grasshopper/patches/4.8.6/0002-grasshopper-led-pwm.patch
+++ b/target/avr32/grasshopper/patches/4.8.11/0002-grasshopper-led-pwm.patch
diff --git a/target/avr32/grasshopper/patches/4.8.6/0003-grasshopper-mmc.patch b/target/avr32/grasshopper/patches/4.8.11/0003-grasshopper-mmc.patch
index f87d4731b..f87d4731b 100644
--- a/target/avr32/grasshopper/patches/4.8.6/0003-grasshopper-mmc.patch
+++ b/target/avr32/grasshopper/patches/4.8.11/0003-grasshopper-mmc.patch
diff --git a/target/avr32/grasshopper/patches/4.8.6/0004-grasshopper-i2c.patch b/target/avr32/grasshopper/patches/4.8.11/0004-grasshopper-i2c.patch
index b0796ed5a..b0796ed5a 100644
--- a/target/avr32/grasshopper/patches/4.8.6/0004-grasshopper-i2c.patch
+++ b/target/avr32/grasshopper/patches/4.8.11/0004-grasshopper-i2c.patch
diff --git a/target/avr32/grasshopper/patches/4.8.6/0005-grasshopper-usart.patch b/target/avr32/grasshopper/patches/4.8.11/0005-grasshopper-usart.patch
index 448647c29..448647c29 100644
--- a/target/avr32/grasshopper/patches/4.8.6/0005-grasshopper-usart.patch
+++ b/target/avr32/grasshopper/patches/4.8.11/0005-grasshopper-usart.patch
diff --git a/target/avr32/grasshopper/patches/4.8.6/0100-netfilter-init-fix.patch b/target/avr32/grasshopper/patches/4.8.11/0100-netfilter-init-fix.patch
index 9d80e8b53..9d80e8b53 100644
--- a/target/avr32/grasshopper/patches/4.8.6/0100-netfilter-init-fix.patch
+++ b/target/avr32/grasshopper/patches/4.8.11/0100-netfilter-init-fix.patch
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index c9e99777b..42b72dceb 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -12,7 +12,6 @@ default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32
 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_OR1K
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG
-default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_SPARC
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 default ADK_TARGET_KERNEL_VERSION_4_8
 
@@ -25,12 +24,11 @@ config ADK_TARGET_KERNEL_VERSION_GIT
 	select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
 config ADK_TARGET_KERNEL_VERSION_4_8
-	bool "4.8.6"
+	bool "4.8.11"
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_OR1K
-	depends on !ADK_TARGET_ARCH_SPARC
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 
 config ADK_TARGET_KERNEL_VERSION_4_4
diff --git a/target/linux/patches/4.8.6/crisv32.patch b/target/linux/patches/4.8.11/crisv32.patch
index cb9b0d028..cb9b0d028 100644
--- a/target/linux/patches/4.8.6/crisv32.patch
+++ b/target/linux/patches/4.8.11/crisv32.patch
diff --git a/target/linux/patches/4.8.6/crisv32_ethernet_driver.patch b/target/linux/patches/4.8.11/crisv32_ethernet_driver.patch
index 0cef202fc..0cef202fc 100644
--- a/target/linux/patches/4.8.6/crisv32_ethernet_driver.patch
+++ b/target/linux/patches/4.8.11/crisv32_ethernet_driver.patch
diff --git a/target/linux/patches/4.8.6/initramfs-nosizelimit.patch b/target/linux/patches/4.8.11/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.8.6/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.8.11/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.8.6/ld-or1k.patch b/target/linux/patches/4.8.11/ld-or1k.patch
index 264f9166f..264f9166f 100644
--- a/target/linux/patches/4.8.6/ld-or1k.patch
+++ b/target/linux/patches/4.8.11/ld-or1k.patch
diff --git a/target/linux/patches/4.8.6/macsonic.patch b/target/linux/patches/4.8.11/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/4.8.6/macsonic.patch
+++ b/target/linux/patches/4.8.11/macsonic.patch
diff --git a/target/linux/patches/4.8.6/microblaze-sigaltstack.patch b/target/linux/patches/4.8.11/microblaze-sigaltstack.patch
index c4064e8b9..c4064e8b9 100644
--- a/target/linux/patches/4.8.6/microblaze-sigaltstack.patch
+++ b/target/linux/patches/4.8.11/microblaze-sigaltstack.patch
diff --git a/target/linux/patches/4.8.6/patch-realtime b/target/linux/patches/4.8.11/patch-realtime
index 6a856dad7..6a856dad7 100644
--- a/target/linux/patches/4.8.6/patch-realtime
+++ b/target/linux/patches/4.8.11/patch-realtime
diff --git a/target/linux/patches/4.8.11/sparc32.patch b/target/linux/patches/4.8.11/sparc32.patch
new file mode 100644
index 000000000..b11e3b7f1
--- /dev/null
+++ b/target/linux/patches/4.8.11/sparc32.patch
@@ -0,0 +1,31 @@
+commit 07b5ab3f71d318e52c18cc3b73c1d44c908aacfa
+Author: Andreas Larsson <andreas@gaisler.com>
+Date:   Wed Nov 9 10:43:05 2016 +0100
+
+    sparc32: Fix inverted invalid_frame_pointer checks on sigreturns
+    
+    Signed-off-by: Andreas Larsson <andreas@gaisler.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
+index c3c12ef..9c0c8fd 100644
+--- a/arch/sparc/kernel/signal_32.c
++++ b/arch/sparc/kernel/signal_32.c
+@@ -89,7 +89,7 @@ asmlinkage void do_sigreturn(struct pt_regs *regs)
+ 	sf = (struct signal_frame __user *) regs->u_regs[UREG_FP];
+ 
+ 	/* 1. Make sure we are not getting garbage from the user */
+-	if (!invalid_frame_pointer(sf, sizeof(*sf)))
++	if (invalid_frame_pointer(sf, sizeof(*sf)))
+ 		goto segv_and_exit;
+ 
+ 	if (get_user(ufp, &sf->info.si_regs.u_regs[UREG_FP]))
+@@ -150,7 +150,7 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
+ 
+ 	synchronize_user_stack();
+ 	sf = (struct rt_signal_frame __user *) regs->u_regs[UREG_FP];
+-	if (!invalid_frame_pointer(sf, sizeof(*sf)))
++	if (invalid_frame_pointer(sf, sizeof(*sf)))
+ 		goto segv;
+ 
+ 	if (get_user(ufp, &sf->regs.u_regs[UREG_FP]))
diff --git a/target/linux/patches/4.8.6/startup.patch b/target/linux/patches/4.8.11/startup.patch
index e54ac19a6..e54ac19a6 100644
--- a/target/linux/patches/4.8.6/startup.patch
+++ b/target/linux/patches/4.8.11/startup.patch
diff --git a/target/linux/patches/4.8.6/vdso2.patch b/target/linux/patches/4.8.11/vdso2.patch
index 35df488a8..35df488a8 100644
--- a/target/linux/patches/4.8.6/vdso2.patch
+++ b/target/linux/patches/4.8.11/vdso2.patch
diff --git a/target/linux/patches/4.8.6/fix-atm_zam_h.patch b/target/linux/patches/4.8.6/fix-atm_zam_h.patch
deleted file mode 100644
index 3019bcf42..000000000
--- a/target/linux/patches/4.8.6/fix-atm_zam_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur linux-4.8.6.orig/include/uapi/linux/atm_zatm.h linux-4.8.6/include/uapi/linux/atm_zatm.h
---- linux-4.8.6.orig/include/uapi/linux/atm_zatm.h	2016-10-31 12:26:46.000000000 +0100
-+++ linux-4.8.6/include/uapi/linux/atm_zatm.h	2016-11-07 10:04:37.142753084 +0100
-@@ -14,7 +14,6 @@
- 
- #include <linux/atmapi.h>
- #include <linux/atmioc.h>
--#include <linux/time.h>
- 
- #define ZATM_GETPOOL	_IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
- 						/* get pool statistics */