diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 13:39:00 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 14:53:39 +0200 |
| commit | 5387bc9cbb9ed205f08766523a296f21dfa83b56 (patch) | |
| tree | 4e8822f417aac2dc8b9f8f4e805569705cb0b5a6 /target/linux/brcm2708/patches-4.14 | |
| parent | 1138e0f8878fe402697fd4b8aceacec39fc28a00 (diff) | |
| download | upstream-5387bc9cbb9ed205f08766523a296f21dfa83b56.tar.gz upstream-5387bc9cbb9ed205f08766523a296f21dfa83b56.tar.bz2 upstream-5387bc9cbb9ed205f08766523a296f21dfa83b56.zip | |
kernel: bump 4.14 to 4.14.111
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch | 8 | ||||
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch index dd41f5d44e..242fa50d9c 100644 --- a/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -170,7 +170,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma platform_set_drvdata(dev, fb); --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1090,6 +1090,31 @@ fb_blank(struct fb_info *info, int blank +@@ -1093,6 +1093,31 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -202,7 +202,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) { -@@ -1100,6 +1125,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1103,6 +1128,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_cmap cmap_from; struct fb_cmap_user cmap; struct fb_event event; @@ -210,7 +210,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma void __user *argp = (void __user *)arg; long ret = 0; -@@ -1217,6 +1243,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1220,6 +1246,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -226,7 +226,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma default: if (!lock_fb_info(info)) return -ENODEV; -@@ -1362,6 +1397,7 @@ static long fb_compat_ioctl(struct file +@@ -1365,6 +1400,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch index 9011de8b96..eb85fe6439 100644 --- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -5580,6 +5588,28 @@ static int __init cgroup_disable(char *s +@@ -5583,6 +5591,28 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); |