aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-08 13:50:17 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-08 14:54:48 +0200
commitaa0e6fc4895c0c8469e0f55d643b510e1c320b37 (patch)
tree4499f35208f7ccd779b157c1d1deac824c32437d /target/linux
parentdad220a00c0490f20f708ba1736bbf39695de55b (diff)
downloadupstream-aa0e6fc4895c0c8469e0f55d643b510e1c320b37.tar.gz
upstream-aa0e6fc4895c0c8469e0f55d643b510e1c320b37.tar.bz2
upstream-aa0e6fc4895c0c8469e0f55d643b510e1c320b37.zip
kernel: bump 4.9 to 4.9.168
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch2
-rw-r--r--target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch8
-rw-r--r--target/linux/generic/hack-4.9/902-debloat_proc.patch2
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch b/target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
index 1c4ef3891c..04a3ec1eeb 100644
--- a/target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
+++ b/target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
@@ -37,7 +37,7 @@
ret = hw_device_init(ci, base);
if (ret < 0) {
dev_err(dev, "can't initialize hardware\n");
-@@ -963,7 +966,7 @@ static int ci_hdrc_probe(struct platform
+@@ -970,7 +973,7 @@ static int ci_hdrc_probe(struct platform
goto deinit_gadget;
}
diff --git a/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch
index c7160c7b2e..4966a99ba6 100644
--- a/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch
@@ -154,7 +154,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
return -ENOTTY;
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
-@@ -1088,6 +1088,31 @@ fb_blank(struct fb_info *info, int blank
+@@ -1091,6 +1091,31 @@ fb_blank(struct fb_info *info, int blank
}
EXPORT_SYMBOL(fb_blank);
@@ -186,7 +186,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg)
{
-@@ -1098,6 +1123,7 @@ static long do_fb_ioctl(struct fb_info *
+@@ -1101,6 +1126,7 @@ static long do_fb_ioctl(struct fb_info *
struct fb_cmap cmap_from;
struct fb_cmap_user cmap;
struct fb_event event;
@@ -194,7 +194,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
void __user *argp = (void __user *)arg;
long ret = 0;
-@@ -1215,6 +1241,15 @@ static long do_fb_ioctl(struct fb_info *
+@@ -1218,6 +1244,15 @@ static long do_fb_ioctl(struct fb_info *
unlock_fb_info(info);
console_unlock();
break;
@@ -210,7 +210,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma
default:
if (!lock_fb_info(info))
return -ENODEV;
-@@ -1369,6 +1404,7 @@ static long fb_compat_ioctl(struct file
+@@ -1372,6 +1407,7 @@ static long fb_compat_ioctl(struct file
case FBIOPAN_DISPLAY:
case FBIOGET_CON2FBMAP:
case FBIOPUT_CON2FBMAP:
diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch
index 91d1d28351..7c4a48f5ff 100644
--- a/target/linux/generic/hack-4.9/902-debloat_proc.patch
+++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch
@@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return -ENOMEM;
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -2714,6 +2714,8 @@ static const struct file_operations proc
+@@ -2718,6 +2718,8 @@ static const struct file_operations proc
static int __init proc_vmalloc_init(void)
{