summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornemaeon2016-11-01 19:25:27 -0400
committernemaeon2016-11-01 19:25:27 -0400
commita95b6b11f371bf2512db7d3084202138bd34ad73 (patch)
tree26cfd7dee856614a729fae8c2d5dc2fed671e06a
parent2dc66f7ae5b489d504124b4ef02ca26eec46fcf1 (diff)
downloadaur-a95b6b11f371bf2512db7d3084202138bd34ad73.tar.gz
Update fbcondecor-4.8.patch to fix malformed patch.
Diffstat
-rw-r--r--.SRCINFO4
-rwxr-xr-xPKGBUILD4
-rw-r--r--fbcondecor-4.8.patch245
3 files changed, 141 insertions, 112 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 237bad1dc793..feb382cdec25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Nov 1 22:13:51 UTC 2016
+# Tue Nov 1 23:25:05 UTC 2016
pkgbase = linux-ck-fbcondecor
pkgver = 4.8.6
pkgrel = 1
@@ -37,7 +37,7 @@ pkgbase = linux-ck-fbcondecor
sha256sums = b5cfe6b2d361cb9051c70b777cf0556ec057a7f240e2014d577284509d46588b
sha256sums = b0b22a3355f13e040b5fc768862234e0b0429bc2dd1db7d54ac4a04162efaf77
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
- sha256sums = d90a80d5c775c16e51e97b81e105328bd9a9489478fab7e497a5094c54d334b2
+ sha256sums = 06181f75c5aa1cd39e8d45418853fd5a272858e4ba862895e3923a8111ab90a8
pkgname = linux-ck-fbcondecor
pkgdesc = Linux Kernel with the ck5 patchset featuring MuQSS CPU scheduler v0.120 and the fbcondecor framebuffer decoration support.
diff --git a/PKGBUILD b/PKGBUILD
index e24d52c17f84..dd6778b4fc62 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ _makemenuconfig=
# to enabled ... in other words, do not use NUMA on a single CPU system.
#
# See, https://bugs.archlinux.org/task/31187
-_NUMAdisable=y
+_NUMAdisable=
# Compile ONLY probed modules
# As of mainline 2.6.32, running with this option will only build the modules
@@ -85,7 +85,7 @@ sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
'b5cfe6b2d361cb9051c70b777cf0556ec057a7f240e2014d577284509d46588b'
'b0b22a3355f13e040b5fc768862234e0b0429bc2dd1db7d54ac4a04162efaf77'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- 'd90a80d5c775c16e51e97b81e105328bd9a9489478fab7e497a5094c54d334b2')
+ '06181f75c5aa1cd39e8d45418853fd5a272858e4ba862895e3923a8111ab90a8')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
diff --git a/fbcondecor-4.8.patch b/fbcondecor-4.8.patch
index dbe314765bbe..690a531a420b 100644
--- a/fbcondecor-4.8.patch
+++ b/fbcondecor-4.8.patch
@@ -1,6 +1,6 @@
diff -ruN a/Documentation/fb/00-INDEX b/Documentation/fb/00-INDEX
--- a/Documentation/fb/00-INDEX 2016-10-02 19:24:33.000000000 -0400
-+++ b/Documentation/fb/00-INDEX 2016-10-24 01:38:34.940038237 -0400
++++ b/Documentation/fb/00-INDEX 2016-11-01 19:02:03.665860500 -0400
@@ -23,6 +23,8 @@
- info on the driver for EP93xx LCD controller.
fbcon.txt
@@ -12,7 +12,7 @@ diff -ruN a/Documentation/fb/00-INDEX b/Documentation/fb/00-INDEX
gxfb.txt
diff -ruN a/Documentation/fb/fbcondecor.txt b/Documentation/fb/fbcondecor.txt
--- a/Documentation/fb/fbcondecor.txt 1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/fb/fbcondecor.txt 2016-10-24 01:38:34.940038237 -0400
++++ b/Documentation/fb/fbcondecor.txt 2016-11-01 19:02:03.666860500 -0400
@@ -0,0 +1,207 @@
+What is it?
+-----------
@@ -223,7 +223,7 @@ diff -ruN a/Documentation/fb/fbcondecor.txt b/Documentation/fb/fbcondecor.txt
+
diff -ruN a/drivers/Makefile b/drivers/Makefile
--- a/drivers/Makefile 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/Makefile 2016-10-24 01:38:34.940038237 -0400
++++ b/drivers/Makefile 2016-11-01 19:02:03.666860500 -0400
@@ -17,6 +17,10 @@
obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/
@@ -249,7 +249,7 @@ diff -ruN a/drivers/Makefile b/drivers/Makefile
diff -ruN a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
--- a/drivers/video/console/bitblit.c 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/console/bitblit.c 2016-10-24 01:38:34.941038237 -0400
++++ b/drivers/video/console/bitblit.c 2016-11-01 19:02:03.666860500 -0400
@@ -18,6 +18,7 @@
#include <linux/console.h>
#include <asm/types.h>
@@ -294,7 +294,7 @@ diff -ruN a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
}
diff -ruN a/drivers/video/console/cfbcondecor.c b/drivers/video/console/cfbcondecor.c
--- a/drivers/video/console/cfbcondecor.c 1969-12-31 19:00:00.000000000 -0500
-+++ b/drivers/video/console/cfbcondecor.c 2016-10-24 01:38:34.941038237 -0400
++++ b/drivers/video/console/cfbcondecor.c 2016-11-01 19:02:03.667860500 -0400
@@ -0,0 +1,471 @@
+/*
+ * linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
@@ -769,7 +769,7 @@ diff -ruN a/drivers/video/console/cfbcondecor.c b/drivers/video/console/cfbconde
+
diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
--- a/drivers/video/console/fbcon.c 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/console/fbcon.c 2016-10-24 02:29:31.787079967 -0400
++++ b/drivers/video/console/fbcon.c 2016-11-01 19:20:47.130875837 -0400
@@ -79,6 +79,7 @@
#include <asm/irq.h>
@@ -876,15 +876,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
}
static void fbcon_cursor(struct vc_data *vc, int mode)
-@@ -1395,6 +1420,7 @@
- rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
- cols /= vc->vc_font.width;
- rows /= vc->vc_font.height;
-+
- vc_resize(vc, cols, rows);
-
- if (con_is_visible(vc)) {
-@@ -1819,7 +1845,7 @@
+@@ -1819,7 +1844,7 @@
count = vc->vc_rows;
if (softback_top)
fbcon_softback_note(vc, t, count);
@@ -893,7 +885,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
goto redraw_up;
switch (p->scrollmode) {
case SCROLL_MOVE:
-@@ -1912,6 +1938,8 @@
+@@ -1912,6 +1937,8 @@
count = vc->vc_rows;
if (logo_shown >= 0)
goto redraw_down;
@@ -902,7 +894,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
switch (p->scrollmode) {
case SCROLL_MOVE:
fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
-@@ -2060,6 +2088,13 @@
+@@ -2060,6 +2087,13 @@
}
return;
}
@@ -916,7 +908,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -2130,8 +2165,8 @@
+@@ -2130,8 +2164,8 @@
var.yres = virt_h * virt_fh;
x_diff = info->var.xres - var.xres;
y_diff = info->var.yres - var.yres;
@@ -927,7 +919,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
const struct fb_videomode *mode;
DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
-@@ -2167,6 +2202,21 @@
+@@ -2167,6 +2201,21 @@
info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
@@ -949,7 +941,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
if (softback_top) {
if (softback_lines)
-@@ -2185,9 +2235,6 @@
+@@ -2185,9 +2234,6 @@
logo_shown = FBCON_LOGO_CANSHOW;
}
@@ -959,7 +951,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
/*
* FIXME: If we have multiple fbdev's loaded, we need to
* update all info->currcon. Perhaps, we can place this
-@@ -2231,6 +2278,18 @@
+@@ -2231,6 +2277,18 @@
fbcon_del_cursor_timer(old_info);
}
@@ -978,7 +970,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
if (fbcon_is_inactive(vc, info) ||
ops->blank_state != FB_BLANK_UNBLANK)
fbcon_del_cursor_timer(info);
-@@ -2339,15 +2398,20 @@
+@@ -2339,15 +2397,20 @@
}
}
@@ -1003,96 +995,133 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
}
if (!blank)
-@@ -2522,10 +2586,16 @@
- }
+@@ -2519,41 +2582,28 @@
+ vc->vc_video_erase_char = c & ~0x100;
+ }
- if (resize) {
-+ /* reset wrap/pan */
+- }
+-
+- if (resize) {
++ } && vc->vc_mode == KD_TEXT) {
++ fbcon_clear_margins(vc, 0);
++ if (resize) { update_screen(vc);
++ /* reset wrap/pan */ }
int cols, rows;
-
- cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
- rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
+-
+- cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
+- rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
++ if (old_data && (--REFCOUNT(old_data) == 0))
++ cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres); kfree(old_data - FONT_EXTRA_WORDS * sizeof(int));
++ rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); return 0;
++ }
+ if (fbcon_decor_active(info, vc)) {
-+ info->var.xoffset = info->var.yoffset = p->yscroll = 0;
-+ cols = vc->vc_decor.twidth;
-+ rows = vc->vc_decor.theight;
-+ }
++ info->var.xoffset = info->var.yoffset = p->yscroll = 0;static int fbcon_copy_font(struct vc_data *vc, int con)
++ cols = vc->vc_decor.twidth; {
++ rows = vc->vc_decor.theight; struct display *od = &fb_display[con];
++ } struct console_font *f = &vc->vc_font;
cols /= w;
- rows /= h;
- vc_resize(vc, cols, rows);
-@@ -2657,7 +2727,12 @@
+- rows /= h;
+- vc_resize(vc, cols, rows);
+- if (con_is_visible(vc) && softback_buf)
+- fbcon_update_softback(vc);
+- } else if (con_is_visible(vc)
+- && vc->vc_mode == KD_TEXT) {
+- fbcon_clear_margins(vc, 0);
+- update_screen(vc);
+- }
+-
+- if (old_data && (--REFCOUNT(old_data) == 0))
+- kfree(old_data - FONT_EXTRA_WORDS * sizeof(int));
+- return 0;
+-}
+-
+-static int fbcon_copy_font(struct vc_data *vc, int con)
+-{
+- struct display *od = &fb_display[con];
+- struct console_font *f = &vc->vc_font;
+-
+- if (od->fontdata == f->data)
+- return 0; /* already the same font... */
+- return fbcon_do_set_font(vc, f->width, f->height, od->fontdata, od->userfont);
+-}
+-
+-/*
+- * User asked to set font; we are guaranteed that
++ rows /= h; if (od->fontdata == f->data)
++ return 0; /* already the same font... */
++ vc_resize(vc, cols, rows); return fbcon_do_set_font(vc, f->width, f->height, od->fontdata, od->userfont);
++ }
++ if (CON_IS_VISIBLE(vc) && softback_buf)
++ fbcon_update_softback(vc); /*
++ } else if (CON_IS_VISIBLE(vc) * User asked to set font; we are guaranteed that
+ * a) width and height are in range 1..32
+ * b) charcount does not exceed 512
+ * but lets not assume that, since someone might someday want to use larger
+@@ -2657,7 +2707,11 @@
int i, j, k, depth;
u8 val;
- if (fbcon_is_inactive(vc, info))
-+ if (fbcon_is_inactive(vc, info)
-+ #ifdef CONFIG_FB_CON_DECOR
-+ || vc->vc_num != fg_console
-+ #endif
-+ )
++ if (fbcon_is_inactive(vc, info)
++#ifdef CONFIG_FB_CON_DECOR
++ || vc->vc_num != fg_console
++#endif
++ )
return;
if (!con_is_visible(vc))
-@@ -2683,14 +2758,56 @@
+@@ -2683,7 +2737,49 @@
} else
fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
- fb_set_cmap(&palette_cmap, info);
-+ if (fbcon_decor_active(info, vc_cons[fg_console].d) &&
-+ info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-+
-+ u16 *red, *green, *blue;
-+ int minlen = min(min(info->var.red.length, info->var.green.length),
-+ info->var.blue.length);
-+ int h;
-+
-+ struct fb_cmap cmap = {
-+ .start = 0,
-+ .len = (1 << minlen),
-+ .red = NULL,
-+ .green = NULL,
-+ .blue = NULL,
-+ .transp = NULL
-+ };
-+
-+ red = kmalloc(256 * sizeof(u16) * 3, GFP_KERNEL);
-+
-+ if (!red)
-+ goto out;
-+
-+ green = red + 256;
-+ blue = green + 256;
-+ cmap.red = red;
-+ cmap.green = green;
-+ cmap.blue = blue;
-+
-+ for (i = 0; i < cmap.len; i++) {
-+ red[i] = green[i] = blue[i] = (0xffff * i)/(cmap.len-1);
-+ }
-+
-+ h = fb_set_cmap(&cmap, info);
-+ fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d);
-+ kfree(red);
-+
-+ return h;
-+
-+ } else if (fbcon_decor_active(info, vc_cons[fg_console].d) &&
-+ info->var.bits_per_pixel == 8 && info->bgdecor.cmap.red != NULL)
-+ fb_set_cmap(&info->bgdecor.cmap, info);
-+
-+out: return fb_set_cmap(&palette_cmap, info);
++ if (fbcon_decor_active(info, vc_cons[fg_console].d) &&
++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
++
++ u16 *red, *green, *blue;
++ int minlen = min(min(info->var.red.length, info->var.green.length),
++ info->var.blue.length);
++ int h;
++
++ struct fb_cmap cmap = {
++ .start = 0,
++ .len = (1 << minlen),
++ .red = NULL,
++ .green = NULL,
++ .blue = NULL,
++ .transp = NULL
++ };
++
++ red = kmalloc(256 * sizeof(u16) * 3, GFP_KERNEL);
++
++ if (!red)
++ goto out;
++
++ green = red + 256;
++ blue = green + 256;
++ cmap.red = red;
++ cmap.green = green;
++ cmap.blue = blue;
++
++ for (i = 0; i < cmap.len; i++) {
++ red[i] = green[i] = blue[i] = (0xffff * i)/(cmap.len-1);
++ }
++
++ h = fb_set_cmap(&cmap, info);
++ fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d);
++ kfree(red);
++
++ return h;
++
++ } else if (fbcon_decor_active(info, vc_cons[fg_console].d) &&
++ info->var.bits_per_pixel == 8 && info->bgdecor.cmap.red != NULL)
++ fb_set_cmap(&info->bgdecor.cmap, info);
++
++ out: return fb_set_cmap(&palette_cmap, info);
}
static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
- {
- unsigned long p;
- int line;
--
-+
- if (vc->vc_num != fg_console || !softback_lines)
- return (u16 *) (vc->vc_origin + offset);
- line = offset / vc->vc_size_row;
-@@ -2908,7 +3025,14 @@
+@@ -2908,7 +3004,14 @@
rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
cols /= vc->vc_font.width;
rows /= vc->vc_font.height;
@@ -1108,7 +1137,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
updatescrollmode(p, info, vc);
scrollback_max = 0;
scrollback_current = 0;
-@@ -2953,7 +3077,9 @@
+@@ -2953,7 +3056,9 @@
rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
cols /= vc->vc_font.width;
rows /= vc->vc_font.height;
@@ -1119,7 +1148,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
}
if (fg != -1)
-@@ -3594,6 +3720,7 @@
+@@ -3594,6 +3699,7 @@
}
}
@@ -1129,7 +1158,7 @@ diff -ruN a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
diff -ruN a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondecor.c
--- a/drivers/video/console/fbcondecor.c 1969-12-31 19:00:00.000000000 -0500
-+++ b/drivers/video/console/fbcondecor.c 2016-10-24 01:38:34.943038237 -0400
++++ b/drivers/video/console/fbcondecor.c 2016-11-01 19:02:03.668860500 -0400
@@ -0,0 +1,555 @@
+/*
+ * linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations
@@ -1688,7 +1717,7 @@ diff -ruN a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondeco
+EXPORT_SYMBOL(fbcon_decor_path);
diff -ruN a/drivers/video/console/fbcondecor.h b/drivers/video/console/fbcondecor.h
--- a/drivers/video/console/fbcondecor.h 1969-12-31 19:00:00.000000000 -0500
-+++ b/drivers/video/console/fbcondecor.h 2016-10-24 01:38:34.943038237 -0400
++++ b/drivers/video/console/fbcondecor.h 2016-11-01 19:02:03.669860500 -0400
@@ -0,0 +1,78 @@
+/*
+ * linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers
@@ -1770,7 +1799,7 @@ diff -ruN a/drivers/video/console/fbcondecor.h b/drivers/video/console/fbcondeco
+#endif /* __FBCON_DECOR_H */
diff -ruN a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
--- a/drivers/video/console/Kconfig 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/console/Kconfig 2016-10-24 01:38:34.940038237 -0400
++++ b/drivers/video/console/Kconfig 2016-11-01 19:02:03.666860500 -0400
@@ -130,6 +130,19 @@
such that other users of the framebuffer will remain normally
oriented.
@@ -1793,7 +1822,7 @@ diff -ruN a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
depends on PARISC
diff -ruN a/drivers/video/console/Makefile b/drivers/video/console/Makefile
--- a/drivers/video/console/Makefile 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/console/Makefile 2016-10-24 01:38:34.941038237 -0400
++++ b/drivers/video/console/Makefile 2016-11-01 19:02:03.666860500 -0400
@@ -16,4 +16,5 @@
fbcon_ccw.o
endif
@@ -1802,7 +1831,7 @@ diff -ruN a/drivers/video/console/Makefile b/drivers/video/console/Makefile
obj-$(CONFIG_FB_STI) += sticore.o
diff -ruN a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
--- a/drivers/video/fbdev/core/fbcmap.c 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/fbdev/core/fbcmap.c 2016-10-24 01:38:34.944038237 -0400
++++ b/drivers/video/fbdev/core/fbcmap.c 2016-11-01 19:02:03.669860500 -0400
@@ -17,6 +17,8 @@
#include <linux/slab.h>
#include <linux/uaccess.h>
@@ -1835,7 +1864,7 @@ diff -ruN a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.
diff -ruN a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
--- a/drivers/video/fbdev/core/fbmem.c 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/fbdev/core/fbmem.c 2016-10-24 01:38:34.944038237 -0400
++++ b/drivers/video/fbdev/core/fbmem.c 2016-11-01 19:02:03.669860500 -0400
@@ -1251,15 +1251,6 @@
u16 reserved[3];
};
@@ -1854,7 +1883,7 @@ diff -ruN a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
{
diff -ruN a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
--- a/drivers/video/fbdev/Kconfig 2016-10-02 19:24:33.000000000 -0400
-+++ b/drivers/video/fbdev/Kconfig 2016-10-24 01:38:34.943038237 -0400
++++ b/drivers/video/fbdev/Kconfig 2016-11-01 19:02:03.669860500 -0400
@@ -1216,7 +1216,6 @@
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
@@ -1865,7 +1894,7 @@ diff -ruN a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
Say Y here if you have a Matrox Millennium, Matrox Millennium II,
diff -ruN a/include/linux/console_decor.h b/include/linux/console_decor.h
--- a/include/linux/console_decor.h 1969-12-31 19:00:00.000000000 -0500
-+++ b/include/linux/console_decor.h 2016-10-24 01:38:34.944038237 -0400
++++ b/include/linux/console_decor.h 2016-11-01 19:02:03.670860500 -0400
@@ -0,0 +1,46 @@
+#ifndef _LINUX_CONSOLE_DECOR_H_
+#define _LINUX_CONSOLE_DECOR_H_ 1
@@ -1915,7 +1944,7 @@ diff -ruN a/include/linux/console_decor.h b/include/linux/console_decor.h
+#endif
diff -ruN a/include/linux/console_struct.h b/include/linux/console_struct.h
--- a/include/linux/console_struct.h 2016-10-02 19:24:33.000000000 -0400
-+++ b/include/linux/console_struct.h 2016-10-24 01:38:34.944038237 -0400
++++ b/include/linux/console_struct.h 2016-11-01 19:02:03.670860500 -0400
@@ -20,6 +20,7 @@
struct uni_pagedir;
@@ -1935,7 +1964,7 @@ diff -ruN a/include/linux/console_struct.h b/include/linux/console_struct.h
diff -ruN a/include/linux/fb.h b/include/linux/fb.h
--- a/include/linux/fb.h 2016-10-02 19:24:33.000000000 -0400
-+++ b/include/linux/fb.h 2016-10-24 01:38:34.945038237 -0400
++++ b/include/linux/fb.h 2016-11-01 19:02:03.670860500 -0400
@@ -238,6 +238,34 @@
};
#endif
@@ -1983,7 +2012,7 @@ diff -ruN a/include/linux/fb.h b/include/linux/fb.h
/* we need the PCI or similar aperture base/size not
diff -ruN a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
--- a/include/uapi/linux/fb.h 2016-10-02 19:24:33.000000000 -0400
-+++ b/include/uapi/linux/fb.h 2016-10-24 01:38:34.946038237 -0400
++++ b/include/uapi/linux/fb.h 2016-11-01 19:02:03.671860500 -0400
@@ -8,6 +8,25 @@
#define FB_MAX 32 /* sufficient for now */
@@ -2068,7 +2097,7 @@ diff -ruN a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
__u32 len; /* Number of entries */
diff -ruN a/kernel/sysctl.c b/kernel/sysctl.c
--- a/kernel/sysctl.c 2016-10-02 19:24:33.000000000 -0400
-+++ b/kernel/sysctl.c 2016-10-24 01:38:34.946038237 -0400
++++ b/kernel/sysctl.c 2016-11-01 19:02:03.671860500 -0400
@@ -149,6 +149,10 @@
static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
#endif