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>
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user