[gentoo-commits] linux-patches r2300 - in genpatches-2.6/trunk: 3.7 3.8

[Tom Wijsman (tomwij)]

Author: tomwij
Date: 2013-02-28 23:23:58 +0000 (Thu, 28 Feb 2013)
New Revision: 2300

Added:
   genpatches-2.6/trunk/3.8/1000_linux-3.8.1.patch
Modified:
   genpatches-2.6/trunk/3.7/4200_fbcondecor-0.9.6.patch
   genpatches-2.6/trunk/3.8/0000_README
   genpatches-2.6/trunk/3.8/4200_fbcondecor-0.9.6.patch
Log:
Linux patch 3.8.1. Updated fbcondecor-0.9.6 to properly work with the 3.7 and 3.8 kernel branches according to bug #459060.

Modified: genpatches-2.6/trunk/3.7/4200_fbcondecor-0.9.6.patch
===================================================================
--- genpatches-2.6/trunk/3.7/4200_fbcondecor-0.9.6.patch	2013-02-28 20:58:06 UTC (rev 2299)
+++ genpatches-2.6/trunk/3.7/4200_fbcondecor-0.9.6.patch	2013-02-28 23:23:58 UTC (rev 2300)
@@ -228,8 +228,7 @@
 index 95952c8..b55db6d 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
-@@ -11,6 +11,10 @@ obj-y				+= gpio/
- obj-$(CONFIG_PCI)		+= pci/
+@@ -16,4 +16,8 @@ obj-$(CONFIG_PCI)		+= pci/
  obj-$(CONFIG_PARISC)		+= parisc/
  obj-$(CONFIG_RAPIDIO)		+= rapidio/
 +# tty/ comes before char/ so that the VT console is the boot-time
@@ -238,8 +237,7 @@
 +obj-y				+= char/
  obj-y				+= video/
  obj-y				+= idle/
- obj-$(CONFIG_ACPI)		+= acpi/
-@@ -29,11 +33,6 @@ obj-$(CONFIG_XEN)		+= xen/
+@@ -37,11 +41,6 @@ obj-$(CONFIG_XEN)		+= xen/
  # regulators early, since some subsystems rely on them to initialize
  obj-$(CONFIG_REGULATOR)		+= regulator/
  
@@ -255,7 +253,7 @@
 index a290be5..3a4ca32 100644
 --- a/drivers/video/Kconfig
 +++ b/drivers/video/Kconfig
-@@ -1241,7 +1241,6 @@ config FB_MATROX
+@@ -1229,7 +1229,6 @@ config FB_MATROX
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
@@ -870,7 +868,7 @@
  	      u16 c, int is_fg)
  {
  	int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -458,7 +459,7 @@ static int __init fb_console_setup(char *this_opt)
+@@ -465,7 +466,7 @@ static int __init fb_console_setup(char *this_opt)
  			} else
  				return 1;
  		}
@@ -879,7 +877,7 @@
  		if (!strncmp(options, "map:", 4)) {
  			options += 4;
  			if (*options) {
-@@ -483,8 +484,8 @@ static int __init fb_console_setup(char *this_opt)
+@@ -490,8 +491,8 @@ static int __init fb_console_setup(char *this_opt)
  				first_fb_vc = 0;
  			if (*options++ == '-')
  				last_fb_vc = simple_strtoul(options, &options, 10) - 1;
@@ -890,7 +888,7 @@
  
  		if (!strncmp(options, "rotate:", 7)) {
  			options += 7;
-@@ -545,6 +546,9 @@ static int fbcon_takeover(int show_logo)
+@@ -552,6 +553,9 @@ static int fbcon_takeover(int show_logo)
  		info_idx = -1;
  	} else {
  		fbcon_has_console_bind = 1;
@@ -900,7 +898,7 @@
  	}
  
  	return err;
-@@ -935,7 +939,7 @@ static const char *fbcon_startup(void)
+@@ -942,7 +946,7 @@ static const char *fbcon_startup(void)
  	info = registered_fb[info_idx];
  	if (!info)
  		return NULL;
@@ -909,7 +907,7 @@
  	owner = info->fbops->owner;
  	if (!try_module_get(owner))
  		return NULL;
-@@ -999,6 +1003,12 @@ static const char *fbcon_startup(void)
+@@ -1006,6 +1010,12 @@ static const char *fbcon_startup(void)
  	rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
  	cols /= vc->vc_font.width;
  	rows /= vc->vc_font.height;
@@ -922,7 +920,7 @@
  	vc_resize(vc, cols, rows);
  
  	DPRINTK("mode:   %s\n", info->fix.id);
-@@ -1028,7 +1038,7 @@ static void fbcon_init(struct vc_data *vc, int init)
+@@ -1035,7 +1045,7 @@ static void fbcon_init(struct vc_data *vc, int init)
  	cap = info->flags;
  
  	if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
@@ -931,7 +929,7 @@
  		logo = 0;
  
  	if (var_to_display(p, &info->var, info))
-@@ -1238,6 +1248,11 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
+@@ -1245,6 +1255,11 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
  	if (sy < vc->vc_top && vc->vc_top == logo_lines)
  		vc->vc_top = 0;
  
@@ -943,7 +941,7 @@
  	/* Split blits that cross physical y_wrap boundary */
  
  	y_break = p->vrows - p->yscroll;
-@@ -1257,10 +1272,15 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s,
+@@ -1264,10 +1279,15 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s,
  	struct display *p = &fb_display[vc->vc_num];
  	struct fbcon_ops *ops = info->fbcon_par;
  
@@ -963,7 +961,7 @@
  }
  
  static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
-@@ -1276,8 +1296,13 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only)
+@@ -1283,8 +1303,13 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only)
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
  	struct fbcon_ops *ops = info->fbcon_par;
  
@@ -979,7 +977,7 @@
  }
  
  static void fbcon_cursor(struct vc_data *vc, int mode)
-@@ -1387,7 +1412,7 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count)
+@@ -1394,7 +1419,7 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count)
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
  	struct fbcon_ops *ops = info->fbcon_par;
  	struct display *p = &fb_display[vc->vc_num];
@@ -988,7 +986,7 @@
  	p->yscroll += count;
  	if (p->yscroll >= p->vrows)	/* Deal with wrap */
  		p->yscroll -= p->vrows;
-@@ -1406,7 +1431,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count)
+@@ -1413,7 +1438,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count)
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
  	struct fbcon_ops *ops = info->fbcon_par;
  	struct display *p = &fb_display[vc->vc_num];
@@ -997,7 +995,7 @@
  	p->yscroll -= count;
  	if (p->yscroll < 0)	/* Deal with wrap */
  		p->yscroll += p->vrows;
-@@ -1473,7 +1498,7 @@ static __inline__ void ypan_down(struct vc_data *vc, int count)
+@@ -1480,7 +1505,7 @@ static __inline__ void ypan_down(struct vc_data *vc, int count)
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
  	struct display *p = &fb_display[vc->vc_num];
  	struct fbcon_ops *ops = info->fbcon_par;
@@ -1006,7 +1004,7 @@
  	p->yscroll -= count;
  	if (p->yscroll < 0) {
  		ops->bmove(vc, info, 0, 0, p->vrows - vc->vc_rows,
-@@ -1797,7 +1822,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
+@@ -1804,7 +1829,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
  			count = vc->vc_rows;
  		if (softback_top)
  			fbcon_softback_note(vc, t, count);
@@ -1015,7 +1013,7 @@
  			goto redraw_up;
  		switch (p->scrollmode) {
  		case SCROLL_MOVE:
-@@ -1890,6 +1915,8 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
+@@ -1897,6 +1922,8 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
  			count = vc->vc_rows;
  		if (logo_shown >= 0)
  			goto redraw_down;
@@ -1024,7 +1022,7 @@
  		switch (p->scrollmode) {
  		case SCROLL_MOVE:
  			fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
-@@ -1982,7 +2009,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
+@@ -1989,7 +2016,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
  {
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
  	struct display *p = &fb_display[vc->vc_num];
@@ -1033,7 +1031,7 @@
  	if (fbcon_is_inactive(vc, info))
  		return;
  
-@@ -2000,7 +2027,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
+@@ -2007,7 +2034,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
  			p->vrows - p->yscroll);
  }
  
@@ -1042,7 +1040,7 @@
  			    int dy, int dx, int height, int width, u_int y_break)
  {
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-@@ -2038,6 +2065,13 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
+@@ -2045,6 +2072,13 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
  		}
  		return;
  	}
@@ -1056,7 +1054,7 @@
  	ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
  		   height, width);
  }
-@@ -2089,7 +2123,7 @@ static void updatescrollmode(struct display *p,
+@@ -2096,7 +2130,7 @@ static void updatescrollmode(struct display *p,
  	}
  }
  
@@ -1065,7 +1063,7 @@
  			unsigned int height, unsigned int user)
  {
  	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-@@ -2108,8 +2142,8 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
+@@ -2115,8 +2149,8 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
  	var.yres = virt_h * virt_fh;
  	x_diff = info->var.xres - var.xres;
  	y_diff = info->var.yres - var.yres;
@@ -1076,7 +1074,7 @@
  		const struct fb_videomode *mode;
  
  		DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
-@@ -2145,6 +2179,21 @@ static int fbcon_switch(struct vc_data *vc)
+@@ -2152,6 +2186,21 @@ static int fbcon_switch(struct vc_data *vc)
  
  	info = registered_fb[con2fb_map[vc->vc_num]];
  	ops = info->fbcon_par;
@@ -1098,7 +1096,7 @@
  
  	if (softback_top) {
  		if (softback_lines)
-@@ -2163,9 +2212,6 @@ static int fbcon_switch(struct vc_data *vc)
+@@ -2170,9 +2219,6 @@ static int fbcon_switch(struct vc_data *vc)
  		logo_shown = FBCON_LOGO_CANSHOW;
  	}
  
@@ -1108,7 +1106,7 @@
  	/*
  	 * FIXME: If we have multiple fbdev's loaded, we need to
  	 * update all info->currcon.  Perhaps, we can place this
-@@ -2209,6 +2255,18 @@ static int fbcon_switch(struct vc_data *vc)
+@@ -2216,6 +2262,18 @@ static int fbcon_switch(struct vc_data *vc)
  			fbcon_del_cursor_timer(old_info);
  	}
  
@@ -1127,7 +1125,7 @@
  	if (fbcon_is_inactive(vc, info) ||
  	    ops->blank_state != FB_BLANK_UNBLANK)
  		fbcon_del_cursor_timer(info);
-@@ -2257,11 +2315,10 @@ static int fbcon_switch(struct vc_data *vc)
+@@ -2264,11 +2322,10 @@ static int fbcon_switch(struct vc_data *vc)
  	    ops->update_start(info);
  	}
  
@@ -1140,7 +1138,7 @@
  		logo_shown = fg_console;
  		/* This is protected above by initmem_freed */
  		fb_show_logo(info, ops->rotate);
-@@ -2317,15 +2374,20 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
+@@ -2324,15 +2381,20 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
  		}
  	}
  
@@ -1165,7 +1163,7 @@
  		}
  
  		if (!blank)
-@@ -2447,7 +2509,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
+@@ -2454,7 +2516,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
  			vc->vc_complement_mask >>= 1;
  			vc->vc_s_complement_mask >>= 1;
  		}
@@ -1174,7 +1172,7 @@
  		/* ++Edmund: reorder the attribute bits */
  		if (vc->vc_can_do_color) {
  			unsigned short *cp =
-@@ -2470,7 +2532,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
+@@ -2477,7 +2539,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
  			vc->vc_complement_mask <<= 1;
  			vc->vc_s_complement_mask <<= 1;
  		}
@@ -1183,7 +1181,7 @@
  		/* ++Edmund: reorder the attribute bits */
  		{
  			unsigned short *cp =
-@@ -2500,13 +2562,22 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
+@@ -2507,13 +2569,22 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
  	}
  
  	if (resize) {
@@ -1206,7 +1204,7 @@
  		if (CON_IS_VISIBLE(vc) && softback_buf)
  			fbcon_update_softback(vc);
  	} else if (CON_IS_VISIBLE(vc)
-@@ -2590,7 +2661,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne
+@@ -2597,7 +2661,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne
  	/* Check if the same font is on some other console already */
  	for (i = first_fb_vc; i <= last_fb_vc; i++) {
  		struct vc_data *tmp = vc_cons[i].d;
@@ -1215,7 +1213,7 @@
  		if (fb_display[i].userfont &&
  		    fb_display[i].fontdata &&
  		    FNTSUM(fb_display[i].fontdata) == csum &&
-@@ -2635,7 +2706,11 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
+@@ -2642,7 +2713,11 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
  	int i, j, k, depth;
  	u8 val;
  
@@ -1228,7 +1226,7 @@
  		return -EINVAL;
  
  	if (!CON_IS_VISIBLE(vc))
-@@ -2661,14 +2736,56 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
+@@ -2668,14 +2743,56 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
  	} else
  		fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
  
@@ -1287,7 +1285,7 @@
  	if (vc->vc_num != fg_console || !softback_lines)
  		return (u16 *) (vc->vc_origin + offset);
  	line = offset / vc->vc_size_row;
-@@ -2887,7 +3004,14 @@ static void fbcon_modechanged(struct fb_info *info)
+@@ -2894,7 +3011,14 @@ static void fbcon_modechanged(struct fb_info *info)
  		rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
  		cols /= vc->vc_font.width;
  		rows /= vc->vc_font.height;
@@ -1303,7 +1301,7 @@
  		updatescrollmode(p, info, vc);
  		scrollback_max = 0;
  		scrollback_current = 0;
-@@ -2932,7 +3056,9 @@ static void fbcon_set_all_vcs(struct fb_info *info)
+@@ -2939,7 +3063,9 @@ static void fbcon_set_all_vcs(struct fb_info *info)
  		rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
  		cols /= vc->vc_font.width;
  		rows /= vc->vc_font.height;
@@ -1314,7 +1312,7 @@
  	}
  
  	if (fg != -1)
-@@ -3542,6 +3668,7 @@ static void fbcon_exit(void)
+@@ -3549,6 +3675,7 @@ static void fbcon_exit(void)
  		}
  	}
  
@@ -1322,7 +1320,7 @@
  	fbcon_has_exited = 1;
  }
  
-@@ -3595,7 +3722,7 @@ static void __exit fb_console_exit(void)
+@@ -3602,7 +3729,7 @@ static void __exit fb_console_exit(void)
  	fbcon_exit();
  	console_unlock();
  	unregister_con_driver(&fb_con);
@@ -2014,7 +2012,7 @@
 index c6ce416..7ce6640 100644
 --- a/drivers/video/fbmem.c
 +++ b/drivers/video/fbmem.c
-@@ -1222,15 +1222,6 @@ struct fb_fix_screeninfo32 {
+@@ -1231,15 +1231,6 @@ struct fb_fix_screeninfo32 {
  	u16			reserved[3];
  };
  
@@ -2107,7 +2105,7 @@
 index d31cb68..ad161bb 100644
 --- a/include/uapi/linux/fb.h
 +++ b/include/uapi/linux/fb.h
-@@ -11,6 +11,25 @@
+@@ -8,6 +8,25 @@
  
  #define FB_MAX			32	/* sufficient for now */
  
@@ -2133,7 +2131,7 @@
  /* ioctls
     0x46 is 'F'								*/
  #define FBIOGET_VSCREENINFO	0x4600
-@@ -39,6 +58,24 @@
+@@ -34,6 +53,24 @@
  #define FBIOPUT_MODEINFO        0x4617
  #define FBIOGET_DISPINFO        0x4618
  #define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
@@ -2158,7 +2156,7 @@
  
  #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
  #define FB_TYPE_PLANES			1	/* Non interleaved planes */
-@@ -291,6 +328,28 @@ struct fb_cmap {
+@@ -286,6 +323,28 @@ struct fb_cmap {
  	__u16 *transp;			/* transparency, can be NULL */
  };
  
@@ -2187,11 +2185,7 @@
  struct fb_con2fbmap {
  	__u32 console;
  	__u32 framebuffer;
-diff --git a/include/linux/fb.h b/include/linux/fb.h
-index d31cb68..ad161bb 100644
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -372,6 +431,34 @@ struct fb_image {
+@@ -367,6 +426,34 @@ struct fb_image {
  	struct fb_cmap cmap;	/* color map info */
  };
  
@@ -2226,8 +2220,12 @@
  /*
   * hardware cursor control
   */
-@@ -881,6 +968,9 @@ struct fb_info {
- #define FBINFO_STATE_SUSPENDED	1
+
+diff --git a/include/linux/fb.h b/include/linux/fb.h
+index d31cb68..ad161bb 100644
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -488,5 +488,8 @@ #define FBINFO_STATE_SUSPENDED		1
  	u32 state;			/* Hardware state i.e suspend */
  	void *fbcon_par;                /* fbcon use-only private area */
 +
@@ -2236,11 +2234,12 @@
  	/* From here on everything is device dependent */
  	void *par;
  	/* we need the PCI or similar aperture base/size not
+
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
 index 4ab1187..6561627 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -142,6 +142,10 @@ static int min_percpu_pagelist_fract = 8;
+@@ -145,6 +145,10 @@ static int min_percpu_pagelist_fract = 8;
  static int ngroups_max = NGROUPS_MAX;
  static const int cap_last_cap = CAP_LAST_CAP;
  
@@ -2251,7 +2250,7 @@
  #ifdef CONFIG_INOTIFY_USER
  #include <linux/inotify.h>
  #endif
-@@ -238,6 +242,15 @@ static struct ctl_table sysctl_base_table[] = {
+@@ -248,6 +252,15 @@ static struct ctl_table sysctl_base_table[] = {
  		.mode		= 0555,
  		.child		= dev_table,
  	},
@@ -2267,7 +2266,7 @@
  	{ }
  };
  
-@@ -1038,7 +1051,7 @@ static struct ctl_table vm_table[] = {
+@@ -1050,7 +1063,7 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= proc_dointvec,
  	},
  	{
@@ -2276,7 +2275,7 @@
  		.data		= &page_cluster,
  		.maxlen		= sizeof(int),
  		.mode		= 0644,
-@@ -1484,7 +1497,7 @@ static struct ctl_table fs_table[] = {
+@@ -1494,7 +1507,7 @@ static struct ctl_table fs_table[] = {
  		.mode		= 0555,
  		.child		= inotify_table,
  	},
@@ -2285,7 +2284,7 @@
  #ifdef CONFIG_EPOLL
  	{
  		.procname	= "epoll",
-@@ -1802,12 +1815,12 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
+@@ -1832,12 +1845,12 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
  	unsigned long page = 0;
  	size_t left;
  	char *kbuf;
@@ -2300,7 +2299,7 @@
  	i = (int *) tbl_data;
  	vleft = table->maxlen / sizeof(*i);
  	left = *lenp;
-@@ -1896,7 +1909,7 @@ static int do_proc_dointvec(struct ctl_table *table, int write,
+@@ -1926,7 +1939,7 @@ static int do_proc_dointvec(struct ctl_table *table, int write,
   * @ppos: file position
   *
   * Reads/writes up to table->maxlen/sizeof(unsigned int) integer
@@ -2309,7 +2308,7 @@
   *
   * Returns 0 on success.
   */
-@@ -2223,7 +2236,7 @@ static int do_proc_dointvec_ms_jiffies_conv(bool *negp, unsigned long *lvalp,
+@@ -2285,7 +2298,7 @@ static int do_proc_dointvec_ms_jiffies_conv(bool *negp, unsigned long *lvalp,
   * @ppos: file position
   *
   * Reads/writes up to table->maxlen/sizeof(unsigned int) integer
@@ -2318,7 +2317,7 @@
   * The values read are assumed to be in seconds, and are converted into
   * jiffies.
   *
-@@ -2245,8 +2258,8 @@ int proc_dointvec_jiffies(struct ctl_table *table, int write,
+@@ -2307,8 +2320,8 @@ int proc_dointvec_jiffies(struct ctl_table *table, int write,
   * @ppos: pointer to the file position
   *
   * Reads/writes up to table->maxlen/sizeof(unsigned int) integer
@@ -2329,7 +2328,7 @@
   * are converted into jiffies.
   *
   * Returns 0 on success.
-@@ -2268,8 +2281,8 @@ int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write,
+@@ -2330,8 +2343,8 @@ int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write,
   * @ppos: the current position in the file
   *
   * Reads/writes up to table->maxlen/sizeof(unsigned int) integer

Modified: genpatches-2.6/trunk/3.8/0000_README
===================================================================
--- genpatches-2.6/trunk/3.8/0000_README	2013-02-28 20:58:06 UTC (rev 2299)
+++ genpatches-2.6/trunk/3.8/0000_README	2013-02-28 23:23:58 UTC (rev 2300)
@@ -39,6 +39,10 @@
 
 Individual Patch Descriptions:
 --------------------------------------------------------------------------
+Patch:  1000_linux-3.8.1.patch
+From:   http://www.kernel.org
+Desc:   Linux 3.8.1
+
 Patch:  1700_enable-thinkpad-micled.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=449248
 Desc:   Enable mic mute led in thinkpads

Added: genpatches-2.6/trunk/3.8/1000_linux-3.8.1.patch
===================================================================
--- genpatches-2.6/trunk/3.8/1000_linux-3.8.1.patch	                        (rev 0)
+++ genpatches-2.6/trunk/3.8/1000_linux-3.8.1.patch	2013-02-28 23:23:58 UTC (rev 2300)
@@ -0,0 +1,6680 @@
+diff --git a/Makefile b/Makefile
+index d69266c..746c856 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 3
+ PATCHLEVEL = 8
+-SUBLEVEL = 0
++SUBLEVEL = 1
+ EXTRAVERSION =
+ NAME = Unicycling Gorilla
+ 
+diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
+index 80e29c6..4801717 100644
+--- a/arch/arm/boot/dts/at91sam9n12.dtsi
++++ b/arch/arm/boot/dts/at91sam9n12.dtsi
+@@ -324,8 +324,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf801c000 0x4000>;
+ 				interrupts = <5 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart0>;
+ 				status = "disabled";
+@@ -335,8 +333,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf8020000 0x4000>;
+ 				interrupts = <6 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart1>;
+ 				status = "disabled";
+@@ -346,8 +342,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf8024000 0x4000>;
+ 				interrupts = <7 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart2>;
+ 				status = "disabled";
+@@ -357,8 +351,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf8028000 0x4000>;
+ 				interrupts = <8 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart3>;
+ 				status = "disabled";
+diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
+index 8ecca69..c461e11 100644
+--- a/arch/arm/boot/dts/at91sam9x5.dtsi
++++ b/arch/arm/boot/dts/at91sam9x5.dtsi
+@@ -402,8 +402,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf801c000 0x200>;
+ 				interrupts = <5 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart0>;
+ 				status = "disabled";
+@@ -413,8 +411,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf8020000 0x200>;
+ 				interrupts = <6 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart1>;
+ 				status = "disabled";
+@@ -424,8 +420,6 @@
+ 				compatible = "atmel,at91sam9260-usart";
+ 				reg = <0xf8024000 0x200>;
+ 				interrupts = <7 4 5>;
+-				atmel,use-dma-rx;
+-				atmel,use-dma-tx;
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&pinctrl_usart2>;
+ 				status = "disabled";
+diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c
+index fc6692e..bd6f56b 100644
+--- a/arch/arm/kernel/sched_clock.c
++++ b/arch/arm/kernel/sched_clock.c
+@@ -93,11 +93,11 @@ static void notrace update_sched_clock(void)
+ 	 * detectable in cyc_to_fixed_sched_clock().
+ 	 */
+ 	raw_local_irq_save(flags);
+-	cd.epoch_cyc = cyc;
++	cd.epoch_cyc_copy = cyc;
+ 	smp_wmb();
+ 	cd.epoch_ns = ns;
+ 	smp_wmb();
+-	cd.epoch_cyc_copy = cyc;
++	cd.epoch_cyc = cyc;
+ 	raw_local_irq_restore(flags);
+ }
+ 
+diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c
+index 2c570cd..69858c7 100644
+--- a/arch/arm/mach-imx/clk-imx25.c
++++ b/arch/arm/mach-imx/clk-imx25.c
+@@ -224,6 +224,9 @@ static int __init __mx25_clocks_init(unsigned long osc_rate)
+ 
+ 	clk_prepare_enable(clk[emi_ahb]);
+ 
++	/* Clock source for gpt must be derived from AHB */
++	clk_set_parent(clk[per5_sel], clk[ahb]);
++
+ 	clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");
+ 	clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
+ 
+diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
+index 11e2a41..26762bf 100644
+--- a/arch/arm/mach-integrator/integrator_ap.c
++++ b/arch/arm/mach-integrator/integrator_ap.c
+@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = {
+ static void __init ap_map_io_atag(void)
+ {
+ 	iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag));
+-	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
+ 	ap_map_io();
+ }
+ 
+@@ -685,6 +684,7 @@ static void __init ap_init(void)
+ 
+ 	platform_device_register(&cfi_flash_device);
+ 
++	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
+ 	sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);
+ 	for (i = 0; i < 4; i++) {
+ 		struct lm_device *lmdev;
+diff --git a/arch/arm/mach-pxa/include/mach/smemc.h b/arch/arm/mach-pxa/include/mach/smemc.h
+index b7de471..b802f28 100644
+--- a/arch/arm/mach-pxa/include/mach/smemc.h
++++ b/arch/arm/mach-pxa/include/mach/smemc.h
+@@ -37,6 +37,7 @@
+ #define CSADRCFG1	(SMEMC_VIRT + 0x84)  /* Address Configuration Register for CS1 */
+ #define CSADRCFG2	(SMEMC_VIRT + 0x88)  /* Address Configuration Register for CS2 */
+ #define CSADRCFG3	(SMEMC_VIRT + 0x8C)  /* Address Configuration Register for CS3 */
++#define CSMSADRCFG	(SMEMC_VIRT + 0xA0)  /* Chip Select Configuration Register */
+ 
+ /*
+  * More handy macros for PCMCIA
+diff --git a/arch/arm/mach-pxa/smemc.c b/arch/arm/mach-pxa/smemc.c
+index 7992305..f38aa89 100644
+--- a/arch/arm/mach-pxa/smemc.c
++++ b/arch/arm/mach-pxa/smemc.c
+@@ -40,6 +40,8 @@ static void pxa3xx_smemc_resume(void)
+ 	__raw_writel(csadrcfg[1], CSADRCFG1);
+ 	__raw_writel(csadrcfg[2], CSADRCFG2);
+ 	__raw_writel(csadrcfg[3], CSADRCFG3);
++	/* CSMSADRCFG wakes up in its default state (0), so we need to set it */
++	__raw_writel(0x2, CSMSADRCFG);
+ }
+ 
+ static struct syscore_ops smemc_syscore_ops = {
+@@ -49,8 +51,19 @@ static struct syscore_ops smemc_syscore_ops = {
+ 
+ static int __init smemc_init(void)
+ {
+-	if (cpu_is_pxa3xx())
++	if (cpu_is_pxa3xx()) {
++		/*
++		 * The only documentation we have on the
++		 * Chip Select Configuration Register (CSMSADRCFG) is that
++		 * it must be programmed to 0x2.
++		 * Moreover, in the bit definitions, the second bit
++		 * (CSMSADRCFG[1]) is called "SETALWAYS".
++		 * Other bits are reserved in this register.
++		 */
++		__raw_writel(0x2, CSMSADRCFG);
++
+ 		register_syscore_ops(&smemc_syscore_ops);
++	}
+ 
+ 	return 0;
+ }
+diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+index 4135de8..13ed33c 100644
+--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
++++ b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+@@ -40,17 +40,17 @@
+ 		addeq	\rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
+ 		addne	\rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
+ 		bic	\rd, \rd, #0xff000
+-		ldr	\rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
++		ldr	\rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
+ 		and	\rd, \rd, #0x00ff0000
+ 		teq	\rd, #0x00440000		@ is it 2440?
+ 1004:
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		moveq	\rd, \rd, lsr #SHIFT_2440TXF
+ 		tst	\rd, #S3C2410_UFSTAT_TXFULL
+ 	.endm
+ 
+ 	.macro  fifo_full_s3c2410 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		tst	\rd, #S3C2410_UFSTAT_TXFULL
+ 	.endm
+ 
+@@ -68,18 +68,18 @@
+ 		addeq	\rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
+ 		addne	\rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
+ 		bic	\rd, \rd, #0xff000
+-		ldr	\rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
++		ldr	\rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
+ 		and	\rd, \rd, #0x00ff0000
+ 		teq	\rd, #0x00440000		@ is it 2440?
+ 
+ 10000:
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		andne	\rd, \rd, #S3C2410_UFSTAT_TXMASK
+ 		andeq	\rd, \rd, #S3C2440_UFSTAT_TXMASK
+ 	.endm
+ 
+ 	.macro fifo_level_s3c2410 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		and	\rd, \rd, #S3C2410_UFSTAT_TXMASK
+ 	.endm
+ 
+diff --git a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+index 7615a14..6a21bee 100644
+--- a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
++++ b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+@@ -31,10 +31,10 @@
+ 
+ 		@@ try the interrupt offset register, since it is there
+ 
+-		ldr	\irqstat, [ \base, #INTPND ]
++		ldr	\irqstat, [\base, #INTPND ]
+ 		teq	\irqstat, #0
+ 		beq	1002f
+-		ldr	\irqnr, [ \base, #INTOFFSET ]
++		ldr	\irqnr, [\base, #INTOFFSET ]
+ 		mov	\tmp, #1
+ 		tst	\irqstat, \tmp, lsl \irqnr
+ 		bne	1001f
+diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S
+index c93bf2d..6183a68 100644
+--- a/arch/arm/mach-s3c24xx/pm-h1940.S
++++ b/arch/arm/mach-s3c24xx/pm-h1940.S
+@@ -30,4 +30,4 @@
+ 
+ h1940_pm_return:
+ 	mov	r0, #S3C2410_PA_GPIO
+-	ldr	pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ]
++	ldr	pc, [r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO]
+diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+index dd5b638..65200ae 100644
+--- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
++++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+@@ -45,9 +45,9 @@ ENTRY(s3c2410_cpu_suspend)
+ 	ldr	r4, =S3C2410_REFRESH
+ 	ldr	r5, =S3C24XX_MISCCR
+ 	ldr	r6, =S3C2410_CLKCON
+-	ldr	r7, [ r4 ]		@ get REFRESH (and ensure in TLB)
+-	ldr	r8, [ r5 ]		@ get MISCCR (and ensure in TLB)
+-	ldr	r9, [ r6 ]		@ get CLKCON (and ensure in TLB)
++	ldr	r7, [r4]		@ get REFRESH (and ensure in TLB)
++	ldr	r8, [r5]		@ get MISCCR (and ensure in TLB)
++	ldr	r9, [r6]		@ get CLKCON (and ensure in TLB)
+ 
+ 	orr	r7, r7, #S3C2410_REFRESH_SELF	@ SDRAM sleep command
+ 	orr	r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
+@@ -61,8 +61,8 @@ ENTRY(s3c2410_cpu_suspend)
+ 	@@ align next bit of code to cache line
+ 	.align	5
+ s3c2410_do_sleep:
+-	streq	r7, [ r4 ]			@ SDRAM sleep command
+-	streq	r8, [ r5 ]			@ SDRAM power-down config
+-	streq	r9, [ r6 ]			@ CPU sleep
++	streq	r7, [r4]			@ SDRAM sleep command
++	streq	r8, [r5]			@ SDRAM power-down config
++	streq	r9, [r6]			@ CPU sleep
+ 1:	beq	1b
+ 	mov	pc, r14
+diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+index c82418e..5adaceb 100644
+--- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
++++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+@@ -57,12 +57,12 @@ s3c2412_sleep_enter1:
+ 	 * retry, as simply returning causes the system to lock.
+ 	*/
+ 
+-	ldrne	r9, [ r1 ]
+-	strne	r9, [ r1 ]
+-	ldrne	r9, [ r2 ]
+-	strne	r9, [ r2 ]
+-	ldrne	r9, [ r3 ]
+-	strne	r9, [ r3 ]
++	ldrne	r9, [r1]
++	strne	r9, [r1]
++	ldrne	r9, [r2]
++	strne	r9, [r2]
++	ldrne	r9, [r3]
++	strne	r9, [r3]
+ 	bne	s3c2412_sleep_enter1
+ 
+ 	mov	pc, r14
+diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
+index 5d59294..a78827b 100644
+--- a/arch/arm/mach-versatile/core.c
++++ b/arch/arm/mach-versatile/core.c
+@@ -36,6 +36,7 @@
+ #include <linux/gfp.h>
+ #include <linux/clkdev.h>
+ #include <linux/mtd/physmap.h>
++#include <linux/bitops.h>
+ 
+ #include <asm/irq.h>
+ #include <asm/hardware/arm_timer.h>
+@@ -65,16 +66,28 @@
+ #define VA_VIC_BASE		__io_address(VERSATILE_VIC_BASE)
+ #define VA_SIC_BASE		__io_address(VERSATILE_SIC_BASE)
+ 
++/* These PIC IRQs are valid in each configuration */
++#define PIC_VALID_ALL	BIT(SIC_INT_KMI0) | BIT(SIC_INT_KMI1) | \
++			BIT(SIC_INT_SCI3) | BIT(SIC_INT_UART3) | \
++			BIT(SIC_INT_CLCD) | BIT(SIC_INT_TOUCH) | \
++			BIT(SIC_INT_KEYPAD) | BIT(SIC_INT_DoC) | \
++			BIT(SIC_INT_USB) | BIT(SIC_INT_PCI0) | \
++			BIT(SIC_INT_PCI1) | BIT(SIC_INT_PCI2) | \
++			BIT(SIC_INT_PCI3)
+ #if 1
+ #define IRQ_MMCI0A	IRQ_VICSOURCE22
+ #define IRQ_AACI	IRQ_VICSOURCE24
+ #define IRQ_ETH		IRQ_VICSOURCE25
+ #define PIC_MASK	0xFFD00000
++#define PIC_VALID	PIC_VALID_ALL
+ #else
+ #define IRQ_MMCI0A	IRQ_SIC_MMCI0A
+ #define IRQ_AACI	IRQ_SIC_AACI
+ #define IRQ_ETH		IRQ_SIC_ETH
+ #define PIC_MASK	0
++#define PIC_VALID	PIC_VALID_ALL | BIT(SIC_INT_MMCI0A) | \
++			BIT(SIC_INT_MMCI1A) | BIT(SIC_INT_AACI) | \
++			BIT(SIC_INT_ETH)
+ #endif
+ 
+ /* Lookup table for finding a DT node that represents the vic instance */
+@@ -102,7 +115,7 @@ void __init versatile_init_irq(void)
+ 					      VERSATILE_SIC_BASE);
+ 
+ 	fpga_irq_init(VA_SIC_BASE, "SIC", IRQ_SIC_START,
+-		IRQ_VICSOURCE31, ~PIC_MASK, np);
++		IRQ_VICSOURCE31, PIC_VALID, np);
+ 
+ 	/*
+ 	 * Interrupts on secondary controller from 0 to 8 are routed to
+diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
+index 2f84f40..e92e5e0 100644
+--- a/arch/arm/mach-versatile/pci.c
++++ b/arch/arm/mach-versatile/pci.c
+@@ -23,6 +23,7 @@
+ #include <linux/io.h>
+ 
+ #include <mach/hardware.h>
++#include <mach/irqs.h>
+ #include <asm/irq.h>
+ #include <asm/mach/pci.h>
+ 
+@@ -327,12 +328,12 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+ 	int irq;
+ 
+ 	/* slot,  pin,	irq
+-	 *  24     1     27
+-	 *  25     1     28
+-	 *  26     1     29
+-	 *  27     1     30
++	 *  24     1     IRQ_SIC_PCI0
++	 *  25     1     IRQ_SIC_PCI1
++	 *  26     1     IRQ_SIC_PCI2
++	 *  27     1     IRQ_SIC_PCI3
+ 	 */
+-	irq = 27 + ((slot - 24 + pin - 1) & 3);
++	irq = IRQ_SIC_PCI0 + ((slot - 24 + pin - 1) & 3);
+ 
+ 	return irq;
+ }
+diff --git a/arch/arm/plat-samsung/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S
+index 207e275..f3a9cff 100644
+--- a/arch/arm/plat-samsung/include/plat/debug-macro.S
++++ b/arch/arm/plat-samsung/include/plat/debug-macro.S
+@@ -14,12 +14,12 @@
+ /* The S5PV210/S5PC110 implementations are as belows. */
+ 
+ 	.macro fifo_level_s5pv210 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		and	\rd, \rd, #S5PV210_UFSTAT_TXMASK
+ 	.endm
+ 
+ 	.macro  fifo_full_s5pv210 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		tst	\rd, #S5PV210_UFSTAT_TXFULL
+ 	.endm
+ 
+@@ -27,7 +27,7 @@
+  * most widely re-used */
+ 
+ 	.macro fifo_level_s3c2440 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		and	\rd, \rd, #S3C2440_UFSTAT_TXMASK
+ 	.endm
+ 
+@@ -36,7 +36,7 @@
+ #endif
+ 
+ 	.macro  fifo_full_s3c2440 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		tst	\rd, #S3C2440_UFSTAT_TXFULL
+ 	.endm
+ 
+@@ -45,11 +45,11 @@
+ #endif
+ 
+ 	.macro	senduart,rd,rx
+-		strb 	\rd, [\rx, # S3C2410_UTXH ]
++		strb 	\rd, [\rx, # S3C2410_UTXH]
+ 	.endm
+ 
+ 	.macro	busyuart, rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFCON ]
++		ldr	\rd, [\rx, # S3C2410_UFCON]
+ 		tst	\rd, #S3C2410_UFCON_FIFOMODE	@ fifo enabled?
+ 		beq	1001f				@
+ 		@ FIFO enabled...
+@@ -60,7 +60,7 @@
+ 
+ 1001:
+ 		@ busy waiting for non fifo
+-		ldr	\rd, [ \rx, # S3C2410_UTRSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UTRSTAT]
+ 		tst	\rd, #S3C2410_UTRSTAT_TXFE
+ 		beq	1001b
+ 
+@@ -68,7 +68,7 @@
+ 	.endm
+ 
+ 	.macro	waituart,rd,rx
+-		ldr	\rd, [ \rx, # S3C2410_UFCON ]
++		ldr	\rd, [\rx, # S3C2410_UFCON]
+ 		tst	\rd, #S3C2410_UFCON_FIFOMODE	@ fifo enabled?
+ 		beq	1001f				@
+ 		@ FIFO enabled...
+@@ -79,7 +79,7 @@
+ 		b	1002f
+ 1001:
+ 		@ idle waiting for non fifo
+-		ldr	\rd, [ \rx, # S3C2410_UTRSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UTRSTAT]
+ 		tst	\rd, #S3C2410_UTRSTAT_TXFE
+ 		beq	1001b
+ 
+diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
+index a4db3d2..41db148 100644
+--- a/arch/arm64/kernel/signal32.c
++++ b/arch/arm64/kernel/signal32.c
+@@ -76,7 +76,7 @@ struct compat_sigcontext {
+ 
+ struct compat_ucontext {
+ 	compat_ulong_t			uc_flags;
+-	struct compat_ucontext		*uc_link;
++	compat_uptr_t			uc_link;
+ 	compat_stack_t			uc_stack;
+ 	struct compat_sigcontext	uc_mcontext;
+ 	compat_sigset_t			uc_sigmask;
+@@ -703,7 +703,7 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
+ 	err |= copy_siginfo_to_user32(&frame->info, info);
+ 
+ 	__put_user_error(0, &frame->sig.uc.uc_flags, err);
+-	__put_user_error(NULL, &frame->sig.uc.uc_link, err);
++	__put_user_error(0, &frame->sig.uc.uc_link, err);
+ 
+ 	memset(&stack, 0, sizeof(stack));
+ 	stack.ss_sp = (compat_uptr_t)current->sas_ss_sp;
+diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
+index ee99f23..7df49fa 100644
+--- a/arch/parisc/include/asm/pgtable.h
++++ b/arch/parisc/include/asm/pgtable.h
+@@ -12,11 +12,10 @@
+ 
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
++#include <linux/mm_types.h>
+ #include <asm/processor.h>
+ #include <asm/cache.h>
+ 
+-struct vm_area_struct;
+-
+ /*
+  * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
+  * memory.  For the return value to be meaningful, ADDR must be >=
+@@ -40,7 +39,14 @@ struct vm_area_struct;
+         do{                                                     \
+                 *(pteptr) = (pteval);                           \
+         } while(0)
+-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
++
++extern void purge_tlb_entries(struct mm_struct *, unsigned long);
++
++#define set_pte_at(mm, addr, ptep, pteval)                      \
++	do {                                                    \
++		set_pte(ptep, pteval);                          \
++		purge_tlb_entries(mm, addr);                    \
++	} while (0)
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
+@@ -466,6 +472,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
+ 		old = pte_val(*ptep);
+ 		new = pte_val(pte_wrprotect(__pte (old)));
+ 	} while (cmpxchg((unsigned long *) ptep, old, new) != old);
++	purge_tlb_entries(mm, addr);
+ #else
+ 	pte_t old_pte = *ptep;
+ 	set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
+diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
+index 48e16dc..b89a85a 100644
+--- a/arch/parisc/kernel/cache.c
++++ b/arch/parisc/kernel/cache.c
+@@ -419,6 +419,24 @@ void kunmap_parisc(void *addr)
+ EXPORT_SYMBOL(kunmap_parisc);
+ #endif
+ 
++void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
++{
++	unsigned long flags;
++
++	/* Note: purge_tlb_entries can be called at startup with
++	   no context.  */
++
++	/* Disable preemption while we play with %sr1.  */
++	preempt_disable();
++	mtsp(mm->context, 1);
++	purge_tlb_start(flags);
++	pdtlb(addr);
++	pitlb(addr);
++	purge_tlb_end(flags);
++	preempt_enable();
++}
++EXPORT_SYMBOL(purge_tlb_entries);
++
+ void __flush_tlb_range(unsigned long sid, unsigned long start,
+ 		       unsigned long end)
+ {
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 17903f1..dabe429 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -275,6 +275,10 @@ config PPC_ADV_DEBUG_DAC_RANGE
+ 	depends on PPC_ADV_DEBUG_REGS && 44x
+ 	default y
+ 
++config PPC_EMULATE_SSTEP
++	bool
++	default y if KPROBES || UPROBES || XMON || HAVE_HW_BREAKPOINT
++
+ source "init/Kconfig"
+ 
+ source "kernel/Kconfig.freezer"
+diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
+index a8fb03e..a80e32b 100644
+--- a/arch/powerpc/include/asm/eeh.h
++++ b/arch/powerpc/include/asm/eeh.h
+@@ -201,6 +201,7 @@ int eeh_dev_check_failure(struct eeh_dev *edev);
+ void __init eeh_addr_cache_build(void);
+ void eeh_add_device_tree_early(struct device_node *);
+ void eeh_add_device_tree_late(struct pci_bus *);
++void eeh_add_sysfs_files(struct pci_bus *);
+ void eeh_remove_bus_device(struct pci_dev *, int);
+ 
+ /**
+@@ -240,6 +241,8 @@ static inline void eeh_add_device_tree_early(struct device_node *dn) { }
+ 
+ static inline void eeh_add_device_tree_late(struct pci_bus *bus) { }
+ 
++static inline void eeh_add_sysfs_files(struct pci_bus *bus) { }
++
+ static inline void eeh_remove_bus_device(struct pci_dev *dev, int purge_pe) { }
+ 
+ static inline void eeh_lock(void) { }
+diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
+index 7206701..466a290 100644
+--- a/arch/powerpc/kernel/machine_kexec_64.c
++++ b/arch/powerpc/kernel/machine_kexec_64.c
+@@ -162,6 +162,8 @@ static int kexec_all_irq_disabled = 0;
+ static void kexec_smp_down(void *arg)
+ {
+ 	local_irq_disable();
++	hard_irq_disable();
++
+ 	mb(); /* make sure our irqs are disabled before we say they are */
+ 	get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
+ 	while(kexec_all_irq_disabled == 0)
+@@ -244,6 +246,8 @@ static void kexec_prepare_cpus(void)
+ 	wake_offline_cpus();
+ 	smp_call_function(kexec_smp_down, NULL, /* wait */0);
+ 	local_irq_disable();
++	hard_irq_disable();
++
+ 	mb(); /* make sure IRQs are disabled before we say they are */
+ 	get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
+ 
+@@ -281,6 +285,7 @@ static void kexec_prepare_cpus(void)
+ 	if (ppc_md.kexec_cpu_down)
+ 		ppc_md.kexec_cpu_down(0, 0);
+ 	local_irq_disable();
++	hard_irq_disable();
+ }
+ 
+ #endif /* SMP */
+diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
+index 07c1269..e51c89f 100644
+--- a/arch/powerpc/kernel/of_platform.c
++++ b/arch/powerpc/kernel/of_platform.c
+@@ -95,6 +95,9 @@ static int of_pci_phb_probe(struct platform_device *dev)
+ 	/* Add probed PCI devices to the device model */
+ 	pci_bus_add_devices(phb->bus);
+ 
++	/* sysfs files should only be added after devices are added */
++	eeh_add_sysfs_files(phb->bus);
++
+ 	return 0;
+ }
+ 
+diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
+index 7c37379..fa12ae4 100644
+--- a/arch/powerpc/kernel/pci-common.c
++++ b/arch/powerpc/kernel/pci-common.c
+@@ -1477,11 +1477,14 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
+ 	pcibios_allocate_bus_resources(bus);
+ 	pcibios_claim_one_bus(bus);
+ 
++	/* Fixup EEH */
++	eeh_add_device_tree_late(bus);
++
+ 	/* Add new devices to global lists.  Register in proc, sysfs. */
+ 	pci_bus_add_devices(bus);
+ 
+-	/* Fixup EEH */
+-	eeh_add_device_tree_late(bus);
++	/* sysfs files should only be added after devices are added */
++	eeh_add_sysfs_files(bus);
+ }
+ EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
+ 
+diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
+index 746e0c8..35baad9 100644
+--- a/arch/powerpc/lib/Makefile
++++ b/arch/powerpc/lib/Makefile
+@@ -19,9 +19,7 @@ obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
+ 			   checksum_wrappers_64.o hweight_64.o \
+ 			   copyuser_power7.o string_64.o copypage_power7.o \
+ 			   memcpy_power7.o
+-obj-$(CONFIG_XMON)	+= sstep.o ldstfp.o
+-obj-$(CONFIG_KPROBES)	+= sstep.o ldstfp.o
+-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= sstep.o ldstfp.o
++obj-$(CONFIG_PPC_EMULATE_SSTEP)	+= sstep.o ldstfp.o
+ 
+ ifeq ($(CONFIG_PPC64),y)
+ obj-$(CONFIG_SMP)	+= locks.o
+diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
+index 9a04322..6b73d6c 100644
+--- a/arch/powerpc/platforms/pseries/eeh.c
++++ b/arch/powerpc/platforms/pseries/eeh.c
+@@ -788,7 +788,6 @@ static void eeh_add_device_late(struct pci_dev *dev)
+ 	dev->dev.archdata.edev = edev;
+ 
+ 	eeh_addr_cache_insert_dev(dev);
+-	eeh_sysfs_add_device(dev);
+ }
+ 
+ /**
+@@ -815,6 +814,29 @@ void eeh_add_device_tree_late(struct pci_bus *bus)
+ EXPORT_SYMBOL_GPL(eeh_add_device_tree_late);
+ 
+ /**
++ * eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus
++ * @bus: PCI bus
++ *
++ * This routine must be used to add EEH sysfs files for PCI
++ * devices which are attached to the indicated PCI bus. The PCI bus
++ * is added after system boot through hotplug or dlpar.
++ */
++void eeh_add_sysfs_files(struct pci_bus *bus)
++{
++	struct pci_dev *dev;
++
++	list_for_each_entry(dev, &bus->devices, bus_list) {
++		eeh_sysfs_add_device(dev);
++		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
++			struct pci_bus *subbus = dev->subordinate;
++			if (subbus)
++				eeh_add_sysfs_files(subbus);
++		}
++	}
++}
++EXPORT_SYMBOL_GPL(eeh_add_sysfs_files);
++
++/**
+  * eeh_remove_device - Undo EEH setup for the indicated pci device
+  * @dev: pci device to be removed
+  * @purge_pe: remove the PE or not
+diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
+index f090e81..8bafa4f 100644
+--- a/arch/s390/kvm/kvm-s390.c
++++ b/arch/s390/kvm/kvm-s390.c
+@@ -766,6 +766,14 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
+ 	} else
+ 		prefix = 0;
+ 
++	/*
++	 * The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy
++	 * copying in vcpu load/put. Lets update our copies before we save
++	 * it into the save area
++	 */
++	save_fp_regs(&vcpu->arch.guest_fpregs);
++	save_access_regs(vcpu->run->s.regs.acrs);
++
+ 	if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs),
+ 			vcpu->arch.guest_fpregs.fprs, 128, prefix))
+ 		return -EFAULT;
+diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
+index 9661e9b..7eb57d2 100644
+--- a/arch/sparc/include/asm/hugetlb.h
++++ b/arch/sparc/include/asm/hugetlb.h
+@@ -12,7 +12,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
+ 
+ static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm)
+ {
+-	hugetlb_setup(mm);
+ }
+ 
+ static inline int is_hugepage_only_range(struct mm_struct *mm,
+diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h
+index 4b39f74..e155388 100644
+--- a/arch/sparc/include/asm/page_64.h
++++ b/arch/sparc/include/asm/page_64.h
+@@ -27,8 +27,8 @@
+ #ifndef __ASSEMBLY__
+ 
+ #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
+-struct mm_struct;
+-extern void hugetlb_setup(struct mm_struct *mm);
++struct pt_regs;
++extern void hugetlb_setup(struct pt_regs *regs);
+ #endif
+ 
+ #define WANT_PAGE_VIRTUAL
+diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
+index b4c258d..e696432 100644
+--- a/arch/sparc/include/asm/tsb.h
++++ b/arch/sparc/include/asm/tsb.h
+@@ -157,17 +157,26 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
+ 	andn		REG2, 0x7, REG2; \
+ 	add		REG1, REG2, REG1;
+ 
+-	/* This macro exists only to make the PMD translator below easier
+-	 * to read.  It hides the ELF section switch for the sun4v code
+-	 * patching.
++	/* These macros exists only to make the PMD translator below
++	 * easier to read.  It hides the ELF section switch for the
++	 * sun4v code patching.
+ 	 */
+-#define OR_PTE_BIT(REG, NAME)				\
++#define OR_PTE_BIT_1INSN(REG, NAME)			\
+ 661:	or		REG, _PAGE_##NAME##_4U, REG;	\
+ 	.section	.sun4v_1insn_patch, "ax";	\
+ 	.word		661b;				\
+ 	or		REG, _PAGE_##NAME##_4V, REG;	\
+ 	.previous;
+ 
++#define OR_PTE_BIT_2INSN(REG, TMP, NAME)		\
++661:	sethi		%hi(_PAGE_##NAME##_4U), TMP;	\
++	or		REG, TMP, REG;			\
++	.section	.sun4v_2insn_patch, "ax";	\
++	.word		661b;				\
++	mov		-1, TMP;			\
++	or		REG, _PAGE_##NAME##_4V, REG;	\
++	.previous;
++
+ 	/* Load into REG the PTE value for VALID, CACHE, and SZHUGE.  */
+ #define BUILD_PTE_VALID_SZHUGE_CACHE(REG)				   \
+ 661:	sethi		%uhi(_PAGE_VALID|_PAGE_SZHUGE_4U), REG;		   \
+@@ -214,12 +223,13 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
+ 	 andn		REG1, PMD_HUGE_PROTBITS, REG2;			      \
+ 	sllx		REG2, PMD_PADDR_SHIFT, REG2;			      \
+ 	/* REG2 now holds PFN << PAGE_SHIFT */				      \
+-	andcc		REG1, PMD_HUGE_EXEC, %g0;			      \
+-	bne,a,pt	%xcc, 1f;					      \
+-	 OR_PTE_BIT(REG2, EXEC);					      \
+-1:	andcc		REG1, PMD_HUGE_WRITE, %g0;			      \
++	andcc		REG1, PMD_HUGE_WRITE, %g0;			      \
+ 	bne,a,pt	%xcc, 1f;					      \
+-	 OR_PTE_BIT(REG2, W);						      \
++	 OR_PTE_BIT_1INSN(REG2, W);					      \
++1:	andcc		REG1, PMD_HUGE_EXEC, %g0;			      \
++	be,pt		%xcc, 1f;					      \
++	 nop;								      \
++	OR_PTE_BIT_2INSN(REG2, REG1, EXEC);				      \
+ 	/* REG1 can now be clobbered, build final PTE */		      \
+ 1:	BUILD_PTE_VALID_SZHUGE_CACHE(REG1);				      \
+ 	ba,pt		%xcc, PTE_LABEL;				      \
+diff --git a/arch/sparc/kernel/tsb.S b/arch/sparc/kernel/tsb.S
+index d4bdc7a..a313e4a 100644
+--- a/arch/sparc/kernel/tsb.S
++++ b/arch/sparc/kernel/tsb.S
+@@ -136,12 +136,43 @@ tsb_miss_page_table_walk_sun4v_fastpath:
+ 	 nop
+ 
+ 	/* It is a huge page, use huge page TSB entry address we
+-	 * calculated above.
++	 * calculated above.  If the huge page TSB has not been
++	 * allocated, setup a trap stack and call hugetlb_setup()
++	 * to do so, then return from the trap to replay the TLB
++	 * miss.
++	 *
++	 * This is necessary to handle the case of transparent huge
++	 * pages where we don't really have a non-atomic context
++	 * in which to allocate the hugepage TSB hash table.  When
++	 * the 'mm' faults in the hugepage for the first time, we
++	 * thus handle it here.  This also makes sure that we can
++	 * allocate the TSB hash table on the correct NUMA node.
+ 	 */
+ 	TRAP_LOAD_TRAP_BLOCK(%g7, %g2)
+-	ldx		[%g7 + TRAP_PER_CPU_TSB_HUGE_TEMP], %g2
+-	cmp		%g2, -1
+-	movne		%xcc, %g2, %g1
++	ldx		[%g7 + TRAP_PER_CPU_TSB_HUGE_TEMP], %g1
++	cmp		%g1, -1
++	bne,pt		%xcc, 60f
++	 nop
++
++661:	rdpr		%pstate, %g5
++	wrpr		%g5, PSTATE_AG | PSTATE_MG, %pstate
++	.section	.sun4v_2insn_patch, "ax"
++	.word		661b
++	SET_GL(1)
++	nop
++	.previous
++
++	rdpr	%tl, %g3
++	cmp	%g3, 1
++	bne,pn	%xcc, winfix_trampoline
++	 nop
++	ba,pt	%xcc, etrap
++	 rd	%pc, %g7
++	call	hugetlb_setup
++	 add	%sp, PTREGS_OFF, %o0
++	ba,pt	%xcc, rtrap
++	 nop
++
+ 60:
+ #endif
+ 
+diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
+index 097aee7..5062ff3 100644
+--- a/arch/sparc/mm/fault_64.c
++++ b/arch/sparc/mm/fault_64.c
+@@ -472,8 +472,13 @@ good_area:
+ #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
+ 	mm_rss = mm->context.huge_pte_count;
+ 	if (unlikely(mm_rss >
+-		     mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit))
+-		tsb_grow(mm, MM_TSB_HUGE, mm_rss);
++		     mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit)) {
++		if (mm->context.tsb_block[MM_TSB_HUGE].tsb)
++			tsb_grow(mm, MM_TSB_HUGE, mm_rss);
++		else
++			hugetlb_setup(regs);
++
++	}
+ #endif
+ 	return;
+ 
+diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
+index c3b7242..82bbf04 100644
+--- a/arch/sparc/mm/init_64.c
++++ b/arch/sparc/mm/init_64.c
+@@ -314,16 +314,31 @@ static void __update_mmu_tsb_insert(struct mm_struct *mm, unsigned long tsb_inde
+ 	struct tsb *tsb = mm->context.tsb_block[tsb_index].tsb;
+ 	unsigned long tag;
+ 
++	if (unlikely(!tsb))
++		return;
++
+ 	tsb += ((address >> tsb_hash_shift) &
+ 		(mm->context.tsb_block[tsb_index].tsb_nentries - 1UL));
+ 	tag = (address >> 22UL);
+ 	tsb_insert(tsb, tag, tte);
+ }
+ 
++#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
++static inline bool is_hugetlb_pte(pte_t pte)
++{
++	if ((tlb_type == hypervisor &&
++	     (pte_val(pte) & _PAGE_SZALL_4V) == _PAGE_SZHUGE_4V) ||
++	    (tlb_type != hypervisor &&
++	     (pte_val(pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U))
++		return true;
++	return false;
++}
++#endif
++
+ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)
+ {
+-	unsigned long tsb_index, tsb_hash_shift, flags;
+ 	struct mm_struct *mm;
++	unsigned long flags;
+ 	pte_t pte = *ptep;
+ 
+ 	if (tlb_type != hypervisor) {
+@@ -335,25 +350,16 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *
+ 
+ 	mm = vma->vm_mm;
+ 
+-	tsb_index = MM_TSB_BASE;
+-	tsb_hash_shift = PAGE_SHIFT;
+-
+ 	spin_lock_irqsave(&mm->context.lock, flags);
+ 
+ #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
+-	if (mm->context.tsb_block[MM_TSB_HUGE].tsb != NULL) {
+-		if ((tlb_type == hypervisor &&
+-		     (pte_val(pte) & _PAGE_SZALL_4V) == _PAGE_SZHUGE_4V) ||
+-		    (tlb_type != hypervisor &&
+-		     (pte_val(pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U)) {
+-			tsb_index = MM_TSB_HUGE;
+-			tsb_hash_shift = HPAGE_SHIFT;
+-		}
+-	}
++	if (mm->context.huge_pte_count && is_hugetlb_pte(pte))
++		__update_mmu_tsb_insert(mm, MM_TSB_HUGE, HPAGE_SHIFT,
++					address, pte_val(pte));
++	else
+ #endif
+-
+-	__update_mmu_tsb_insert(mm, tsb_index, tsb_hash_shift,
+-				address, pte_val(pte));
++		__update_mmu_tsb_insert(mm, MM_TSB_BASE, PAGE_SHIFT,
++					address, pte_val(pte));
+ 
+ 	spin_unlock_irqrestore(&mm->context.lock, flags);
+ }
+@@ -2712,14 +2718,28 @@ static void context_reload(void *__data)
+ 		load_secondary_context(mm);
+ }
+ 
+-void hugetlb_setup(struct mm_struct *mm)
++void hugetlb_setup(struct pt_regs *regs)
+ {
+-	struct tsb_config *tp = &mm->context.tsb_block[MM_TSB_HUGE];
++	struct mm_struct *mm = current->mm;
++	struct tsb_config *tp;
+ 
+-	if (likely(tp->tsb != NULL))
+-		return;
++	if (in_atomic() || !mm) {
++		const struct exception_table_entry *entry;
++
++		entry = search_exception_tables(regs->tpc);
++		if (entry) {
++			regs->tpc = entry->fixup;
++			regs->tnpc = regs->tpc + 4;
++			return;
++		}
++		pr_alert("Unexpected HugeTLB setup in atomic context.\n");
++		die_if_kernel("HugeTSB in atomic", regs);
++	}
++
++	tp = &mm->context.tsb_block[MM_TSB_HUGE];
++	if (likely(tp->tsb == NULL))
++		tsb_grow(mm, MM_TSB_HUGE, 0);
+ 
+-	tsb_grow(mm, MM_TSB_HUGE, 0);
+ 	tsb_context_switch(mm);
+ 	smp_tsb_sync(mm);
+ 
+diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
+index 3e8fec3..ba6ae7f 100644
+--- a/arch/sparc/mm/tlb.c
++++ b/arch/sparc/mm/tlb.c
+@@ -135,8 +135,15 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,
+ 			mm->context.huge_pte_count++;
+ 		else
+ 			mm->context.huge_pte_count--;
+-		if (mm->context.huge_pte_count == 1)
+-			hugetlb_setup(mm);
++
++		/* Do not try to allocate the TSB hash table if we
++		 * don't have one already.  We have various locks held
++		 * and thus we'll end up doing a GFP_KERNEL allocation
++		 * in an atomic context.
++		 *
++		 * Instead, we let the first TLB miss on a hugepage
++		 * take care of this.
++		 */
+ 	}
+ 
+ 	if (!pmd_none(orig)) {
+diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
+index 7f64743..428982b 100644
+--- a/arch/sparc/mm/tsb.c
++++ b/arch/sparc/mm/tsb.c
+@@ -314,7 +314,7 @@ void tsb_grow(struct mm_struct *mm, unsigned long tsb_index, unsigned long rss)
+ retry_tsb_alloc:
+ 	gfp_flags = GFP_KERNEL;
+ 	if (new_size > (PAGE_SIZE * 2))
+-		gfp_flags = __GFP_NOWARN | __GFP_NORETRY;
++		gfp_flags |= __GFP_NOWARN | __GFP_NORETRY;
+ 
+ 	new_tsb = kmem_cache_alloc_node(tsb_caches[new_cache_index],
+ 					gfp_flags, numa_node_id());
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 225543b..0694d09 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1253,10 +1253,6 @@ config NODES_SHIFT
+ 	  Specify the maximum number of NUMA Nodes available on the target
+ 	  system.  Increases memory reserved to accommodate various tables.
+ 
+-config HAVE_ARCH_ALLOC_REMAP
+-	def_bool y
+-	depends on X86_32 && NUMA
+-
+ config ARCH_HAVE_MEMORY_PRESENT
+ 	def_bool y
+ 	depends on X86_32 && DISCONTIGMEM
+diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
+index eb05fb3..8a9b3e2 100644
+--- a/arch/x86/include/asm/mmzone_32.h
++++ b/arch/x86/include/asm/mmzone_32.h
+@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];
+ 
+ #include <asm/numaq.h>
+ 
+-extern void resume_map_numa_kva(pgd_t *pgd);
+-
+-#else /* !CONFIG_NUMA */
+-
+-static inline void resume_map_numa_kva(pgd_t *pgd) {}
+-
+ #endif /* CONFIG_NUMA */
+ 
+ #ifdef CONFIG_DISCONTIGMEM
+diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
+index 0a630dd..646d192 100644
+--- a/arch/x86/kernel/cpu/mshyperv.c
++++ b/arch/x86/kernel/cpu/mshyperv.c
+@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platform(void)
+ 	printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n",
+ 	       ms_hyperv.features, ms_hyperv.hints);
+ 
+-	clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
++	if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
++		clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
+ }
+ 
+ const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
+diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
+index 2d125be..8504f36 100644
+--- a/arch/x86/mm/numa.c
++++ b/arch/x86/mm/numa.c
+@@ -193,7 +193,6 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
+ static void __init setup_node_data(int nid, u64 start, u64 end)
+ {
+ 	const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
+-	bool remapped = false;
+ 	u64 nd_pa;
+ 	void *nd;
+ 	int tnid;
+@@ -205,37 +204,28 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
+ 	if (end && (end - start) < NODE_MIN_SIZE)
+ 		return;
+ 
+-	/* initialize remap allocator before aligning to ZONE_ALIGN */
+-	init_alloc_remap(nid, start, end);
+-
+ 	start = roundup(start, ZONE_ALIGN);
+ 
+ 	printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n",
+ 	       nid, start, end - 1);
+ 
+ 	/*
+-	 * Allocate node data.  Try remap allocator first, node-local
+-	 * memory and then any node.  Never allocate in DMA zone.
++	 * Allocate node data.  Try node-local memory and then any node.
++	 * Never allocate in DMA zone.
+ 	 */
+-	nd = alloc_remap(nid, nd_size);
+-	if (nd) {
+-		nd_pa = __pa(nd);
+-		remapped = true;
+-	} else {
+-		nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
+-		if (!nd_pa) {
+-			pr_err("Cannot find %zu bytes in node %d\n",
+-			       nd_size, nid);
+-			return;
+-		}
+-		nd = __va(nd_pa);
++	nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
++	if (!nd_pa) {
++		pr_err("Cannot find %zu bytes in node %d\n",
++		       nd_size, nid);
++		return;
+ 	}
++	nd = __va(nd_pa);
+ 
+ 	/* report and initialize */
+-	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]%s\n",
+-	       nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
++	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]\n",
++	       nd_pa, nd_pa + nd_size - 1);
+ 	tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
+-	if (!remapped && tnid != nid)
++	if (tnid != nid)
+ 		printk(KERN_INFO "    NODE_DATA(%d) on node %d\n", nid, tnid);
+ 
+ 	node_data[nid] = nd;
+diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
+index 534255a..73a6d73 100644
+--- a/arch/x86/mm/numa_32.c
++++ b/arch/x86/mm/numa_32.c
+@@ -73,167 +73,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
+ 
+ extern unsigned long highend_pfn, highstart_pfn;
+ 
+-#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
+-
+-static void *node_remap_start_vaddr[MAX_NUMNODES];
+-void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
+-
+-/*
+- * Remap memory allocator
+- */
+-static unsigned long node_remap_start_pfn[MAX_NUMNODES];
+-static void *node_remap_end_vaddr[MAX_NUMNODES];
+-static void *node_remap_alloc_vaddr[MAX_NUMNODES];
+-
+-/**
+- * alloc_remap - Allocate remapped memory
+- * @nid: NUMA node to allocate memory from
+- * @size: The size of allocation
+- *
+- * Allocate @size bytes from the remap area of NUMA node @nid.  The
+- * size of the remap area is predetermined by init_alloc_remap() and
+- * only the callers considered there should call this function.  For
+- * more info, please read the comment on top of init_alloc_remap().
+- *
+- * The caller must be ready to handle allocation failure from this
+- * function and fall back to regular memory allocator in such cases.
+- *
+- * CONTEXT:
+- * Single CPU early boot context.
+- *
+- * RETURNS:
+- * Pointer to the allocated memory on success, %NULL on failure.
+- */
+-void *alloc_remap(int nid, unsigned long size)
+-{
+-	void *allocation = node_remap_alloc_vaddr[nid];
+-
+-	size = ALIGN(size, L1_CACHE_BYTES);
+-
+-	if (!allocation || (allocation + size) > node_remap_end_vaddr[nid])
+-		return NULL;
+-
+-	node_remap_alloc_vaddr[nid] += size;
+-	memset(allocation, 0, size);
+-
+-	return allocation;
+-}
+-
+-#ifdef CONFIG_HIBERNATION
+-/**
+- * resume_map_numa_kva - add KVA mapping to the temporary page tables created
+- *                       during resume from hibernation
+- * @pgd_base - temporary resume page directory
+- */
+-void resume_map_numa_kva(pgd_t *pgd_base)
+-{
+-	int node;
+-
+-	for_each_online_node(node) {
+-		unsigned long start_va, start_pfn, nr_pages, pfn;
+-
+-		start_va = (unsigned long)node_remap_start_vaddr[node];
+-		start_pfn = node_remap_start_pfn[node];
+-		nr_pages = (node_remap_end_vaddr[node] -
+-			    node_remap_start_vaddr[node]) >> PAGE_SHIFT;
+-
+-		printk(KERN_DEBUG "%s: node %d\n", __func__, node);
+-
+-		for (pfn = 0; pfn < nr_pages; pfn += PTRS_PER_PTE) {
+-			unsigned long vaddr = start_va + (pfn << PAGE_SHIFT);
+-			pgd_t *pgd = pgd_base + pgd_index(vaddr);
+-			pud_t *pud = pud_offset(pgd, vaddr);
+-			pmd_t *pmd = pmd_offset(pud, vaddr);
+-
+-			set_pmd(pmd, pfn_pmd(start_pfn + pfn,
+-						PAGE_KERNEL_LARGE_EXEC));
+-
+-			printk(KERN_DEBUG "%s: %08lx -> pfn %08lx\n",
+-				__func__, vaddr, start_pfn + pfn);
+-		}
+-	}
+-}
+-#endif
+-
+-/**
+- * init_alloc_remap - Initialize remap allocator for a NUMA node
+- * @nid: NUMA node to initizlie remap allocator for
+- *
+- * NUMA nodes may end up without any lowmem.  As allocating pgdat and
+- * memmap on a different node with lowmem is inefficient, a special
+- * remap allocator is implemented which can be used by alloc_remap().
+- *
+- * For each node, the amount of memory which will be necessary for
+- * pgdat and memmap is calculated and two memory areas of the size are
+- * allocated - one in the node and the other in lowmem; then, the area
+- * in the node is remapped to the lowmem area.
+- *
+- * As pgdat and memmap must be allocated in lowmem anyway, this
+- * doesn't waste lowmem address space; however, the actual lowmem
+- * which gets remapped over is wasted.  The amount shouldn't be
+- * problematic on machines this feature will be used.
+- *
+- * Initialization failure isn't fatal.  alloc_remap() is used
+- * opportunistically and the callers will fall back to other memory
+- * allocation mechanisms on failure.
+- */
+-void __init init_alloc_remap(int nid, u64 start, u64 end)
+-{
+-	unsigned long start_pfn = start >> PAGE_SHIFT;
+-	unsigned long end_pfn = end >> PAGE_SHIFT;
+-	unsigned long size, pfn;
+-	u64 node_pa, remap_pa;
+-	void *remap_va;
+-
+-	/*
+-	 * The acpi/srat node info can show hot-add memroy zones where
+-	 * memory could be added but not currently present.
+-	 */
+-	printk(KERN_DEBUG "node %d pfn: [%lx - %lx]\n",
+-	       nid, start_pfn, end_pfn);
+-
+-	/* calculate the necessary space aligned to large page size */
+-	size = node_memmap_size_bytes(nid, start_pfn, end_pfn);
+-	size += ALIGN(sizeof(pg_data_t), PAGE_SIZE);
+-	size = ALIGN(size, LARGE_PAGE_BYTES);
+-
+-	/* allocate node memory and the lowmem remap area */
+-	node_pa = memblock_find_in_range(start, end, size, LARGE_PAGE_BYTES);
+-	if (!node_pa) {
+-		pr_warning("remap_alloc: failed to allocate %lu bytes for node %d\n",
+-			   size, nid);
+-		return;
+-	}
+-	memblock_reserve(node_pa, size);
+-
+-	remap_pa = memblock_find_in_range(min_low_pfn << PAGE_SHIFT,
+-					  max_low_pfn << PAGE_SHIFT,
+-					  size, LARGE_PAGE_BYTES);
+-	if (!remap_pa) {
+-		pr_warning("remap_alloc: failed to allocate %lu bytes remap area for node %d\n",
+-			   size, nid);
+-		memblock_free(node_pa, size);
+-		return;
+-	}
+-	memblock_reserve(remap_pa, size);
+-	remap_va = phys_to_virt(remap_pa);
+-
+-	/* perform actual remap */
+-	for (pfn = 0; pfn < size >> PAGE_SHIFT; pfn += PTRS_PER_PTE)
+-		set_pmd_pfn((unsigned long)remap_va + (pfn << PAGE_SHIFT),
+-			    (node_pa >> PAGE_SHIFT) + pfn,
+-			    PAGE_KERNEL_LARGE);
+-
+-	/* initialize remap allocator parameters */
+-	node_remap_start_pfn[nid] = node_pa >> PAGE_SHIFT;
+-	node_remap_start_vaddr[nid] = remap_va;
+-	node_remap_end_vaddr[nid] = remap_va + size;
+-	node_remap_alloc_vaddr[nid] = remap_va;
+-
+-	printk(KERN_DEBUG "remap_alloc: node %d [%08llx-%08llx) -> [%p-%p)\n",
+-	       nid, node_pa, node_pa + size, remap_va, remap_va + size);
+-}
+-
+ void __init initmem_init(void)
+ {
+ 	x86_numa_init();
+diff --git a/arch/x86/mm/numa_internal.h b/arch/x86/mm/numa_internal.h
+index 7178c3a..ad86ec9 100644
+--- a/arch/x86/mm/numa_internal.h
++++ b/arch/x86/mm/numa_internal.h
+@@ -21,12 +21,6 @@ void __init numa_reset_distance(void);
+ 
+ void __init x86_numa_init(void);
+ 
+-#ifdef CONFIG_X86_64
+-static inline void init_alloc_remap(int nid, u64 start, u64 end)	{ }
+-#else
+-void __init init_alloc_remap(int nid, u64 start, u64 end);
+-#endif
+-
+ #ifdef CONFIG_NUMA_EMU
+ void __init numa_emulation(struct numa_meminfo *numa_meminfo,
+ 			   int numa_dist_cnt);
+diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
+index 74202c1..7d28c88 100644
+--- a/arch/x86/power/hibernate_32.c
++++ b/arch/x86/power/hibernate_32.c
+@@ -129,8 +129,6 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
+ 		}
+ 	}
+ 
+-	resume_map_numa_kva(pgd_base);
+-
+ 	return 0;
+ }
+ 
+diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
+index 83e866d..f7a080e 100644
+--- a/arch/x86/xen/spinlock.c
++++ b/arch/x86/xen/spinlock.c
+@@ -328,7 +328,6 @@ static noinline void xen_spin_unlock_slow(struct xen_spinlock *xl)
+ 		if (per_cpu(lock_spinners, cpu) == xl) {
+ 			ADD_STATS(released_slow_kicked, 1);
+ 			xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);
+-			break;
+ 		}
+ 	}
+ }
+diff --git a/drivers/base/bus.c b/drivers/base/bus.c
+index 24eb078..6856303 100644
+--- a/drivers/base/bus.c
++++ b/drivers/base/bus.c
+@@ -290,7 +290,7 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start,
+ 	struct device *dev;
+ 	int error = 0;
+ 
+-	if (!bus)
++	if (!bus || !bus->p)
+ 		return -EINVAL;
+ 
+ 	klist_iter_init_node(&bus->p->klist_devices, &i,
+@@ -324,7 +324,7 @@ struct device *bus_find_device(struct bus_type *bus,
+ 	struct klist_iter i;
+ 	struct device *dev;
+ 
+-	if (!bus)
++	if (!bus || !bus->p)
+ 		return NULL;
+ 
+ 	klist_iter_init_node(&bus->p->klist_devices, &i,
+diff --git a/drivers/base/dd.c b/drivers/base/dd.c
+index e3bbed8..61d3e1b 100644
+--- a/drivers/base/dd.c
++++ b/drivers/base/dd.c
+@@ -172,6 +172,8 @@ static int deferred_probe_initcall(void)
+ 
+ 	driver_deferred_probe_enable = true;
+ 	driver_deferred_probe_trigger();
++	/* Sort as many dependencies as possible before exiting initcalls */
++	flush_workqueue(deferred_wq);
+ 	return 0;
+ }
+ late_initcall(deferred_probe_initcall);
+diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
+index bc6f5fa..819dfda 100644
+--- a/drivers/dca/dca-core.c
++++ b/drivers/dca/dca-core.c
+@@ -420,6 +420,11 @@ void unregister_dca_provider(struct dca_provider *dca, struct device *dev)
+ 
+ 	raw_spin_lock_irqsave(&dca_lock, flags);
+ 
++	if (list_empty(&dca_domains)) {
++		raw_spin_unlock_irqrestore(&dca_lock, flags);
++		return;
++	}
++
+ 	list_del(&dca->node);
+ 
+ 	pci_rc = dca_pci_rc_from_dev(dev);
+diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
+index 3315e4b..b70709b 100644
+--- a/drivers/dma/sh/shdma.c
++++ b/drivers/dma/sh/shdma.c
+@@ -326,7 +326,7 @@ static int sh_dmae_set_slave(struct shdma_chan *schan,
+ 						    shdma_chan);
+ 	const struct sh_dmae_slave_config *cfg = dmae_find_slave(sh_chan, slave_id);
+ 	if (!cfg)
+-		return -ENODEV;
++		return -ENXIO;
+ 
+ 	if (!try)
+ 		sh_chan->config = cfg;
+diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
+index bdc8302..deca78f 100644
+--- a/drivers/gpio/gpio-em.c
++++ b/drivers/gpio/gpio-em.c
+@@ -299,8 +299,9 @@ static int em_gio_probe(struct platform_device *pdev)
+ 	irq_chip->irq_set_type = em_gio_irq_set_type;
+ 	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE;
+ 
+-	p->irq_domain = irq_domain_add_linear(pdev->dev.of_node,
++	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
+ 					      pdata->number_of_pins,
++					      pdata->irq_base,
+ 					      &em_gio_irq_domain_ops, p);
+ 	if (!p->irq_domain) {
+ 		ret = -ENXIO;
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index f2d667b..bcb2c0a 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -2089,7 +2089,7 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth)
+ 
+ 	switch (bpp) {
+ 	case 8:
+-		fmt = DRM_FORMAT_RGB332;
++		fmt = DRM_FORMAT_C8;
+ 		break;
+ 	case 16:
+ 		if (depth == 15)
+@@ -3702,6 +3702,7 @@ void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
+ 			  int *bpp)
+ {
+ 	switch (format) {
++	case DRM_FORMAT_C8:
+ 	case DRM_FORMAT_RGB332:
+ 	case DRM_FORMAT_BGR233:
+ 		*depth = 8;
+diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
+index 5a3770f..aaded22 100644
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -87,9 +87,6 @@ static struct edid_quirk {
+ 	int product_id;
+ 	u32 quirks;
+ } edid_quirk_list[] = {
+-	/* ASUS VW222S */
+-	{ "ACI", 0x22a2, EDID_QUIRK_FORCE_REDUCED_BLANKING },
+-
+ 	/* Acer AL1706 */
+ 	{ "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },
+ 	/* Acer F51 */
+@@ -357,10 +354,14 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
+ 				break;
+ 			}
+ 		}
+-		if (i == 4)
++
++		if (i == 4 && print_bad_edid) {
+ 			dev_warn(connector->dev->dev,
+ 			 "%s: Ignoring invalid EDID block %d.\n",
+ 			 drm_get_connector_name(connector), j);
++
++			connector->bad_edid_counter++;
++		}
+ 	}
+ 
+ 	if (valid_extensions != block[0x7e]) {
+@@ -2020,7 +2021,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+ 	num_modes += add_cvt_modes(connector, edid);
+ 	num_modes += add_standard_modes(connector, edid);
+ 	num_modes += add_established_modes(connector, edid);
+-	num_modes += add_inferred_modes(connector, edid);
++	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
++		num_modes += add_inferred_modes(connector, edid);
+ 	num_modes += add_cea_modes(connector, edid);
+ 
+ 	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
+diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
+index 3cec306..34a156f 100644
+--- a/drivers/gpu/drm/drm_usb.c
++++ b/drivers/gpu/drm/drm_usb.c
+@@ -18,7 +18,7 @@ int drm_get_usb_dev(struct usb_interface *interface,
+ 
+ 	usbdev = interface_to_usbdev(interface);
+ 	dev->usbdev = usbdev;
+-	dev->dev = &usbdev->dev;
++	dev->dev = &interface->dev;
+ 
+ 	mutex_lock(&drm_global_mutex);
+ 
+diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
+index 9d4a2c2..8a7c48b 100644
+--- a/drivers/gpu/drm/i915/i915_debugfs.c
++++ b/drivers/gpu/drm/i915/i915_debugfs.c
+@@ -691,7 +691,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
+ 
+ 	seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
+ 		   error->time.tv_usec);
+-	seq_printf(m, "Kernel: " UTS_RELEASE);
++	seq_printf(m, "Kernel: " UTS_RELEASE "\n");
+ 	seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
+ 	seq_printf(m, "EIR: 0x%08x\n", error->eir);
+ 	seq_printf(m, "IER: 0x%08x\n", error->ier);
+@@ -888,7 +888,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
+ 		u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);
+ 		u32 rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS);
+ 		u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
+-		u32 rpstat;
++		u32 rpstat, cagf;
+ 		u32 rpupei, rpcurup, rpprevup;
+ 		u32 rpdownei, rpcurdown, rpprevdown;
+ 		int max_freq;
+@@ -907,6 +907,11 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
+ 		rpdownei = I915_READ(GEN6_RP_CUR_DOWN_EI);
+ 		rpcurdown = I915_READ(GEN6_RP_CUR_DOWN);
+ 		rpprevdown = I915_READ(GEN6_RP_PREV_DOWN);
++		if (IS_HASWELL(dev))
++			cagf = (rpstat & HSW_CAGF_MASK) >> HSW_CAGF_SHIFT;
++		else
++			cagf = (rpstat & GEN6_CAGF_MASK) >> GEN6_CAGF_SHIFT;
++		cagf *= GT_FREQUENCY_MULTIPLIER;
+ 
+ 		gen6_gt_force_wake_put(dev_priv);
+ 		mutex_unlock(&dev->struct_mutex);
+@@ -919,8 +924,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
+ 			   gt_perf_status & 0xff);
+ 		seq_printf(m, "Render p-state limit: %d\n",
+ 			   rp_state_limits & 0xff);
+-		seq_printf(m, "CAGF: %dMHz\n", ((rpstat & GEN6_CAGF_MASK) >>
+-						GEN6_CAGF_SHIFT) * GT_FREQUENCY_MULTIPLIER);
++		seq_printf(m, "CAGF: %dMHz\n", cagf);
+ 		seq_printf(m, "RP CUR UP EI: %dus\n", rpupei &
+ 			   GEN6_CURICONT_MASK);
+ 		seq_printf(m, "RP CUR UP: %dus\n", rpcurup &
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index 12ab3bd..7339a4b 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -919,7 +919,7 @@ typedef struct drm_i915_private {
+ 	bool hw_contexts_disabled;
+ 	uint32_t hw_context_size;
+ 
+-	bool fdi_rx_polarity_reversed;
++	u32 fdi_rx_config;
+ 
+ 	struct i915_suspend_saved_registers regfile;
+ 
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index 8febea6..de45b60 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -1918,9 +1918,6 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
+ 	BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
+ 	BUG_ON(!obj->active);
+ 
+-	if (obj->pin_count) /* are we a framebuffer? */
+-		intel_mark_fb_idle(obj);
+-
+ 	list_move_tail(&obj->mm_list, &dev_priv->mm.inactive_list);
+ 
+ 	list_del_init(&obj->ring_list);
+@@ -3848,7 +3845,7 @@ void i915_gem_l3_remap(struct drm_device *dev)
+ 	u32 misccpctl;
+ 	int i;
+ 
+-	if (!IS_IVYBRIDGE(dev))
++	if (!HAS_L3_GPU_CACHE(dev))
+ 		return;
+ 
+ 	if (!dev_priv->l3_parity.remap_info)
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index 59afb7e..2bfd05a 100644
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -3927,7 +3927,7 @@
+ #define  FDI_10BPC                      (1<<16)
+ #define  FDI_6BPC                       (2<<16)
+ #define  FDI_12BPC                      (3<<16)
+-#define  FDI_LINK_REVERSE_OVERWRITE     (1<<15)
++#define  FDI_RX_LINK_REVERSAL_OVERRIDE  (1<<15)
+ #define  FDI_DMI_LINK_REVERSE_MASK      (1<<14)
+ #define  FDI_RX_PLL_ENABLE              (1<<13)
+ #define  FDI_FS_ERR_CORRECT_ENABLE      (1<<11)
+@@ -4211,7 +4211,9 @@
+ #define GEN6_RP_INTERRUPT_LIMITS		0xA014
+ #define GEN6_RPSTAT1				0xA01C
+ #define   GEN6_CAGF_SHIFT			8
++#define   HSW_CAGF_SHIFT			7
+ #define   GEN6_CAGF_MASK			(0x7f << GEN6_CAGF_SHIFT)
++#define   HSW_CAGF_MASK				(0x7f << HSW_CAGF_SHIFT)
+ #define GEN6_RP_CONTROL				0xA024
+ #define   GEN6_RP_MEDIA_TURBO			(1<<11)
+ #define   GEN6_RP_MEDIA_MODE_MASK		(3<<9)
+@@ -4280,8 +4282,8 @@
+ #define   GEN6_PCODE_READ_MIN_FREQ_TABLE	0x9
+ #define	  GEN6_PCODE_WRITE_RC6VIDS		0x4
+ #define	  GEN6_PCODE_READ_RC6VIDS		0x5
+-#define   GEN6_ENCODE_RC6_VID(mv)		(((mv) / 5) - 245) < 0 ?: 0
+-#define   GEN6_DECODE_RC6_VID(vids)		(((vids) * 5) > 0 ? ((vids) * 5) + 245 : 0)
++#define   GEN6_ENCODE_RC6_VID(mv)		(((mv) - 245) / 5)
++#define   GEN6_DECODE_RC6_VID(vids)		(((vids) * 5) + 245)
+ #define GEN6_PCODE_DATA				0x138128
+ #define   GEN6_PCODE_FREQ_IA_RATIO_SHIFT	8
+ 
+@@ -4524,6 +4526,7 @@
+ #define  DDI_BUF_EMP_800MV_0DB_HSW		(7<<24)   /* Sel7 */
+ #define  DDI_BUF_EMP_800MV_3_5DB_HSW		(8<<24)   /* Sel8 */
+ #define  DDI_BUF_EMP_MASK			(0xf<<24)
++#define  DDI_BUF_PORT_REVERSAL			(1<<16)
+ #define  DDI_BUF_IS_IDLE			(1<<7)
+ #define  DDI_A_4_LANES				(1<<4)
+ #define  DDI_PORT_WIDTH_X1			(0<<1)
+diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
+index 9293878..06b1786 100644
+--- a/drivers/gpu/drm/i915/intel_crt.c
++++ b/drivers/gpu/drm/i915/intel_crt.c
+@@ -800,10 +800,14 @@ void intel_crt_init(struct drm_device *dev)
+ 	dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;
+ 
+ 	/*
+-	 * TODO: find a proper way to discover whether we need to set the
+-	 * polarity reversal bit or not, instead of relying on the BIOS.
++	 * TODO: find a proper way to discover whether we need to set the the
++	 * polarity and link reversal bits or not, instead of relying on the
++	 * BIOS.
+ 	 */
+-	if (HAS_PCH_LPT(dev))
+-		dev_priv->fdi_rx_polarity_reversed =
+-		     !!(I915_READ(_FDI_RXA_CTL) & FDI_RX_POLARITY_REVERSED_LPT);
++	if (HAS_PCH_LPT(dev)) {
++		u32 fdi_config = FDI_RX_POLARITY_REVERSED_LPT |
++				 FDI_RX_LINK_REVERSAL_OVERRIDE;
++
++		dev_priv->fdi_rx_config = I915_READ(_FDI_RXA_CTL) & fdi_config;
++	}
+ }
+diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
+index 4bad0f7..59b778d 100644
+--- a/drivers/gpu/drm/i915/intel_ddi.c
++++ b/drivers/gpu/drm/i915/intel_ddi.c
+@@ -178,10 +178,8 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
+ 				  FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);
+ 
+ 	/* Enable the PCH Receiver FDI PLL */
+-	rx_ctl_val = FDI_RX_PLL_ENABLE | FDI_RX_ENHANCE_FRAME_ENABLE |
+-		     ((intel_crtc->fdi_lanes - 1) << 19);
+-	if (dev_priv->fdi_rx_polarity_reversed)
+-		rx_ctl_val |= FDI_RX_POLARITY_REVERSED_LPT;
++	rx_ctl_val = dev_priv->fdi_rx_config | FDI_RX_ENHANCE_FRAME_ENABLE |
++		     FDI_RX_PLL_ENABLE | ((intel_crtc->fdi_lanes - 1) << 19);
+ 	I915_WRITE(_FDI_RXA_CTL, rx_ctl_val);
+ 	POSTING_READ(_FDI_RXA_CTL);
+ 	udelay(220);
+@@ -203,7 +201,10 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
+ 					DP_TP_CTL_LINK_TRAIN_PAT1 |
+ 					DP_TP_CTL_ENABLE);
+ 
+-		/* Configure and enable DDI_BUF_CTL for DDI E with next voltage */
++		/* Configure and enable DDI_BUF_CTL for DDI E with next voltage.
++		 * DDI E does not support port reversal, the functionality is
++		 * achieved on the PCH side in FDI_RX_CTL, so no need to set the
++		 * port reversal bit */
+ 		I915_WRITE(DDI_BUF_CTL(PORT_E),
+ 			   DDI_BUF_CTL_ENABLE |
+ 			   ((intel_crtc->fdi_lanes - 1) << 1) |
+@@ -677,8 +678,11 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
+ 
+ 	if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
+ 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
++		struct intel_digital_port *intel_dig_port =
++			enc_to_dig_port(encoder);
+ 
+-		intel_dp->DP = DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;
++		intel_dp->DP = intel_dig_port->port_reversal |
++			       DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;
+ 		switch (intel_dp->lane_count) {
+ 		case 1:
+ 			intel_dp->DP |= DDI_PORT_WIDTH_X1;
+@@ -1291,11 +1295,15 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
+ 	int type = intel_encoder->type;
+ 
+ 	if (type == INTEL_OUTPUT_HDMI) {
++		struct intel_digital_port *intel_dig_port =
++			enc_to_dig_port(encoder);
++
+ 		/* In HDMI/DVI mode, the port width, and swing/emphasis values
+ 		 * are ignored so nothing special needs to be done besides
+ 		 * enabling the port.
+ 		 */
+-		I915_WRITE(DDI_BUF_CTL(port), DDI_BUF_CTL_ENABLE);
++		I915_WRITE(DDI_BUF_CTL(port),
++			   intel_dig_port->port_reversal | DDI_BUF_CTL_ENABLE);
+ 	} else if (type == INTEL_OUTPUT_EDP) {
+ 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
+ 
+@@ -1457,6 +1465,7 @@ static const struct drm_encoder_helper_funcs intel_ddi_helper_funcs = {
+ 
+ void intel_ddi_init(struct drm_device *dev, enum port port)
+ {
++	struct drm_i915_private *dev_priv = dev->dev_private;
+ 	struct intel_digital_port *intel_dig_port;
+ 	struct intel_encoder *intel_encoder;
+ 	struct drm_encoder *encoder;
+@@ -1497,6 +1506,8 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+ 	intel_encoder->get_hw_state = intel_ddi_get_hw_state;
+ 
+ 	intel_dig_port->port = port;
++	intel_dig_port->port_reversal = I915_READ(DDI_BUF_CTL(port)) &
++					DDI_BUF_PORT_REVERSAL;
+ 	if (hdmi_connector)
+ 		intel_dig_port->hdmi.sdvox_reg = DDI_BUF_CTL(port);
+ 	else
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index da1ad9c..80aa1fc 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -154,8 +154,8 @@ static const intel_limit_t intel_limits_i9xx_sdvo = {
+ 	.vco = { .min = 1400000, .max = 2800000 },
+ 	.n = { .min = 1, .max = 6 },
+ 	.m = { .min = 70, .max = 120 },
+-	.m1 = { .min = 10, .max = 22 },
+-	.m2 = { .min = 5, .max = 9 },
++	.m1 = { .min = 8, .max = 18 },
++	.m2 = { .min = 3, .max = 7 },
+ 	.p = { .min = 5, .max = 80 },
+ 	.p1 = { .min = 1, .max = 8 },
+ 	.p2 = { .dot_limit = 200000,
+@@ -2017,18 +2017,29 @@ void intel_unpin_fb_obj(struct drm_i915_gem_object *obj)
+ 
+ /* Computes the linear offset to the base tile and adjusts x, y. bytes per pixel
+  * is assumed to be a power-of-two. */
+-unsigned long intel_gen4_compute_offset_xtiled(int *x, int *y,
+-					       unsigned int bpp,
+-					       unsigned int pitch)
++unsigned long intel_gen4_compute_page_offset(int *x, int *y,
++					     unsigned int tiling_mode,
++					     unsigned int cpp,
++					     unsigned int pitch)
+ {
+-	int tile_rows, tiles;
++	if (tiling_mode != I915_TILING_NONE) {
++		unsigned int tile_rows, tiles;
++
++		tile_rows = *y / 8;
++		*y %= 8;
+ 
+-	tile_rows = *y / 8;
+-	*y %= 8;
+-	tiles = *x / (512/bpp);
+-	*x %= 512/bpp;
++		tiles = *x / (512/cpp);
++		*x %= 512/cpp;
++
++		return tile_rows * pitch * 8 + tiles * 4096;
++	} else {
++		unsigned int offset;
+ 
+-	return tile_rows * pitch * 8 + tiles * 4096;
++		offset = *y * pitch + *x * cpp;
++		*y = 0;
++		*x = (offset & 4095) / cpp;
++		return offset & -4096;
++	}
+ }
+ 
+ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
+@@ -2105,9 +2116,9 @@ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
+ 
+ 	if (INTEL_INFO(dev)->gen >= 4) {
+ 		intel_crtc->dspaddr_offset =
+-			intel_gen4_compute_offset_xtiled(&x, &y,
+-							 fb->bits_per_pixel / 8,
+-							 fb->pitches[0]);
++			intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
++						       fb->bits_per_pixel / 8,
++						       fb->pitches[0]);
+ 		linear_offset -= intel_crtc->dspaddr_offset;
+ 	} else {
+ 		intel_crtc->dspaddr_offset = linear_offset;
+@@ -2198,9 +2209,9 @@ static int ironlake_update_plane(struct drm_crtc *crtc,
+ 
+ 	linear_offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8);
+ 	intel_crtc->dspaddr_offset =
+-		intel_gen4_compute_offset_xtiled(&x, &y,
+-						 fb->bits_per_pixel / 8,
+-						 fb->pitches[0]);
++		intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
++					       fb->bits_per_pixel / 8,
++					       fb->pitches[0]);
+ 	linear_offset -= intel_crtc->dspaddr_offset;
+ 
+ 	DRM_DEBUG_KMS("Writing base %08X %08lX %d %d %d\n",
+@@ -3686,6 +3697,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
+ 	struct intel_encoder *encoder;
+ 	int pipe = intel_crtc->pipe;
+ 	int plane = intel_crtc->plane;
++	u32 pctl;
+ 
+ 
+ 	if (!intel_crtc->active)
+@@ -3705,6 +3717,13 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
+ 
+ 	intel_disable_plane(dev_priv, plane, pipe);
+ 	intel_disable_pipe(dev_priv, pipe);
++
++	/* Disable pannel fitter if it is on this pipe. */
++	pctl = I915_READ(PFIT_CONTROL);
++	if ((pctl & PFIT_ENABLE) &&
++	    ((pctl & PFIT_PIPE_MASK) >> PFIT_PIPE_SHIFT) == pipe)
++		I915_WRITE(PFIT_CONTROL, 0);
++
+ 	intel_disable_pll(dev_priv, pipe);
+ 
+ 	intel_crtc->active = false;
+@@ -6993,11 +7012,6 @@ void intel_mark_busy(struct drm_device *dev)
+ 
+ void intel_mark_idle(struct drm_device *dev)
+ {
+-}
+-
+-void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
+-{
+-	struct drm_device *dev = obj->base.dev;
+ 	struct drm_crtc *crtc;
+ 
+ 	if (!i915_powersave)
+@@ -7007,12 +7021,11 @@ void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
+ 		if (!crtc->fb)
+ 			continue;
+ 
+-		if (to_intel_framebuffer(crtc->fb)->obj == obj)
+-			intel_increase_pllclock(crtc);
++		intel_decrease_pllclock(crtc);
+ 	}
+ }
+ 
+-void intel_mark_fb_idle(struct drm_i915_gem_object *obj)
++void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
+ {
+ 	struct drm_device *dev = obj->base.dev;
+ 	struct drm_crtc *crtc;
+@@ -7025,7 +7038,7 @@ void intel_mark_fb_idle(struct drm_i915_gem_object *obj)
+ 			continue;
+ 
+ 		if (to_intel_framebuffer(crtc->fb)->obj == obj)
+-			intel_decrease_pllclock(crtc);
++			intel_increase_pllclock(crtc);
+ 	}
+ }
+ 
+@@ -8888,6 +8901,9 @@ static struct intel_quirk intel_quirks[] = {
+ 
+ 	/* Acer Aspire 5734Z must invert backlight brightness */
+ 	{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
++
++	/* Acer Aspire 4736Z */
++	{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
+ };
+ 
+ static void intel_init_quirks(struct drm_device *dev)
+diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
+index 8a1bd4a..1c1840f 100644
+--- a/drivers/gpu/drm/i915/intel_drv.h
++++ b/drivers/gpu/drm/i915/intel_drv.h
+@@ -377,6 +377,7 @@ struct intel_dp {
+ struct intel_digital_port {
+ 	struct intel_encoder base;
+ 	enum port port;
++	u32 port_reversal;
+ 	struct intel_dp dp;
+ 	struct intel_hdmi hdmi;
+ };
+@@ -439,9 +440,8 @@ extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg,
+ extern void intel_dvo_init(struct drm_device *dev);
+ extern void intel_tv_init(struct drm_device *dev);
+ extern void intel_mark_busy(struct drm_device *dev);
+-extern void intel_mark_idle(struct drm_device *dev);
+ extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj);
+-extern void intel_mark_fb_idle(struct drm_i915_gem_object *obj);
++extern void intel_mark_idle(struct drm_device *dev);
+ extern bool intel_lvds_init(struct drm_device *dev);
+ extern void intel_dp_init(struct drm_device *dev, int output_reg,
+ 			  enum port port);
+@@ -627,9 +627,10 @@ extern void intel_update_sprite_watermarks(struct drm_device *dev, int pipe,
+ extern void intel_update_linetime_watermarks(struct drm_device *dev, int pipe,
+ 			 struct drm_display_mode *mode);
+ 
+-extern unsigned long intel_gen4_compute_offset_xtiled(int *x, int *y,
+-						      unsigned int bpp,
+-						      unsigned int pitch);
++extern unsigned long intel_gen4_compute_page_offset(int *x, int *y,
++						    unsigned int tiling_mode,
++						    unsigned int bpp,
++						    unsigned int pitch);
+ 
+ extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
+ 				     struct drm_file *file_priv);
+diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
+index bee8cb6..a3730e0 100644
+--- a/drivers/gpu/drm/i915/intel_panel.c
++++ b/drivers/gpu/drm/i915/intel_panel.c
+@@ -321,6 +321,9 @@ void intel_panel_enable_backlight(struct drm_device *dev,
+ 	if (dev_priv->backlight_level == 0)
+ 		dev_priv->backlight_level = intel_panel_get_max_backlight(dev);
+ 
++	dev_priv->backlight_enabled = true;
++	intel_panel_actually_set_backlight(dev, dev_priv->backlight_level);
++
+ 	if (INTEL_INFO(dev)->gen >= 4) {
+ 		uint32_t reg, tmp;
+ 
+@@ -356,12 +359,12 @@ void intel_panel_enable_backlight(struct drm_device *dev,
+ 	}
+ 
+ set_level:
+-	/* Call below after setting BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1.
+-	 * BLC_PWM_CPU_CTL may be cleared to zero automatically when these
+-	 * registers are set.
++	/* Check the current backlight level and try to set again if it's zero.
++	 * On some machines, BLC_PWM_CPU_CTL is cleared to zero automatically
++	 * when BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1 are written.
+ 	 */
+-	dev_priv->backlight_enabled = true;
+-	intel_panel_actually_set_backlight(dev, dev_priv->backlight_level);
++	if (!intel_panel_get_backlight(dev))
++		intel_panel_actually_set_backlight(dev, dev_priv->backlight_level);
+ }
+ 
+ static void intel_panel_init_backlight(struct drm_device *dev)
+diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
+index d7b060e..9a8d667 100644
+--- a/drivers/gpu/drm/i915/intel_sprite.c
++++ b/drivers/gpu/drm/i915/intel_sprite.c
+@@ -122,8 +122,8 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
+ 
+ 	linear_offset = y * fb->pitches[0] + x * pixel_size;
+ 	sprsurf_offset =
+-		intel_gen4_compute_offset_xtiled(&x, &y,
+-						 pixel_size, fb->pitches[0]);
++		intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
++					       pixel_size, fb->pitches[0]);
+ 	linear_offset -= sprsurf_offset;
+ 
+ 	/* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET
+@@ -287,8 +287,8 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
+ 
+ 	linear_offset = y * fb->pitches[0] + x * pixel_size;
+ 	dvssurf_offset =
+-		intel_gen4_compute_offset_xtiled(&x, &y,
+-						 pixel_size, fb->pitches[0]);
++		intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
++					       pixel_size, fb->pitches[0]);
+ 	linear_offset -= dvssurf_offset;
+ 
+ 	if (obj->tiling_mode != I915_TILING_NONE)
+diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h
+index b79025d..123270e9 100644
+--- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h
++++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h
+@@ -16,6 +16,8 @@ enum dcb_output_type {
+ 
+ struct dcb_output {
+ 	int index;	/* may not be raw dcb index if merging has happened */
++	u16 hasht;
++	u16 hashm;
+ 	enum dcb_output_type type;
+ 	uint8_t i2c_index;
+ 	uint8_t heads;
+@@ -25,6 +27,7 @@ struct dcb_output {
+ 	uint8_t or;
+ 	uint8_t link;
+ 	bool duallink_possible;
++	uint8_t extdev;
+ 	union {
+ 		struct sor_conf {
+ 			int link;
+diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c b/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
+index 0fd87df..2d9b9d7 100644
+--- a/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
++++ b/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
+@@ -107,6 +107,18 @@ dcb_outp(struct nouveau_bios *bios, u8 idx, u8 *ver, u8 *len)
+ 	return 0x0000;
+ }
+ 
++static inline u16
++dcb_outp_hasht(struct dcb_output *outp)
++{
++	return (outp->extdev << 8) | (outp->location << 4) | outp->type;
++}
++
++static inline u16
++dcb_outp_hashm(struct dcb_output *outp)
++{
++	return (outp->heads << 8) | (outp->link << 6) | outp->or;
++}
++
+ u16
+ dcb_outp_parse(struct nouveau_bios *bios, u8 idx, u8 *ver, u8 *len,
+ 	       struct dcb_output *outp)
+@@ -135,34 +147,28 @@ dcb_outp_parse(struct nouveau_bios *bios, u8 idx, u8 *ver, u8 *len,
+ 			case DCB_OUTPUT_DP:
+ 				outp->link = (conf & 0x00000030) >> 4;
+ 				outp->sorconf.link = outp->link; /*XXX*/
++				outp->extdev = 0x00;
++				if (outp->location != 0)
++					outp->extdev = (conf & 0x0000ff00) >> 8;
+ 				break;
+ 			default:
+ 				break;
+ 			}
+ 		}
++
++		outp->hasht = dcb_outp_hasht(outp);
++		outp->hashm = dcb_outp_hashm(outp);
+ 	}
+ 	return dcb;
+ }
+