[gentoo-commits] linux-patches r1686 - genpatches-2.6/trunk/2.6.33

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-02-25 00:12:16 +0000 (Thu, 25 Feb 2010)
New Revision: 1686

Added:
   genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch
Modified:
   genpatches-2.6/trunk/2.6.33/0000_README
   genpatches-2.6/trunk/2.6.33/4200_fbcondecor-0.9.6.patch
Log:
Adding fbcondecor 0.9.6-2.6.33-rc7 and modified uac patch

Modified: genpatches-2.6/trunk/2.6.33/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.33/0000_README	2010-02-24 23:41:07 UTC (rev 1685)
+++ genpatches-2.6/trunk/2.6.33/0000_README	2010-02-25 00:12:16 UTC (rev 1686)
@@ -46,3 +46,8 @@
 Patch:	4200_fbcondecor-0.9.6.patch
 From:	http://dev.gentoo.org/~spock
 Desc:	Bootsplash successor by Michal Januszewski
+
+Patch:  4400_alpha-sysctl-uac.patch
+From:   Tavis Ormandy <taviso@g.o> and http://bugs.gentoo.org/show_bug.cgi?id=217323
+Desc:   Enable control of the unaligned access control policy from sysctl
+

Modified: genpatches-2.6/trunk/2.6.33/4200_fbcondecor-0.9.6.patch
===================================================================
--- genpatches-2.6/trunk/2.6.33/4200_fbcondecor-0.9.6.patch	2010-02-24 23:41:07 UTC (rev 1685)
+++ genpatches-2.6/trunk/2.6.33/4200_fbcondecor-0.9.6.patch	2010-02-25 00:12:16 UTC (rev 1686)
@@ -225,7 +225,7 @@
 +  Michal Januszewski <spock@g.o>
 +
 diff --git a/drivers/Makefile b/drivers/Makefile
-index bc4205d..794ce71 100644
+index 6ee53c7..4285118 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
 @@ -9,6 +9,9 @@ obj-y				+= gpio/
@@ -237,8 +237,8 @@
 +obj-y				+= char/
  obj-y				+= video/
  obj-$(CONFIG_ACPI)		+= acpi/
- # PnP must come after ACPI since it will eventually need to check if acpi
-@@ -21,10 +24,6 @@ obj-$(CONFIG_XEN)		+= xen/
+ obj-$(CONFIG_SFI)		+= sfi/
+@@ -22,10 +25,6 @@ obj-$(CONFIG_XEN)		+= xen/
  # regulators early, since some subsystems rely on them to initialize
  obj-$(CONFIG_REGULATOR)		+= regulator/
  
@@ -250,10 +250,10 @@
  obj-y				+= gpu/
  
 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 3b54b39..23ce357 100644
+index 5a5c303..5c55b00 100644
 --- a/drivers/video/Kconfig
 +++ b/drivers/video/Kconfig
-@@ -1160,7 +1160,6 @@ config FB_MATROX
+@@ -1180,7 +1180,6 @@ config FB_MATROX
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
@@ -262,10 +262,10 @@
  	---help---
  	  Say Y here if you have a Matrox Millennium, Matrox Millennium II,
 diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
-index 2f50a80..aa73fb7 100644
+index fc7d9bb..cb8412e 100644
 --- a/drivers/video/console/Kconfig
 +++ b/drivers/video/console/Kconfig
-@@ -128,6 +128,19 @@ config FRAMEBUFFER_CONSOLE_ROTATION
+@@ -121,6 +121,19 @@ config FRAMEBUFFER_CONSOLE_ROTATION
           such that other users of the framebuffer will remain normally
           oriented.
  
@@ -286,10 +286,10 @@
          bool "STI text console"
          depends on PARISC
 diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
-index ac46cc3..e300ea0 100644
+index a862e91..86bfcff 100644
 --- a/drivers/video/console/Makefile
 +++ b/drivers/video/console/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \
+@@ -34,6 +34,7 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \
                                           fbcon_ccw.o
  endif
  
@@ -298,7 +298,7 @@
  
  ifeq ($(CONFIG_USB_SISUSBVGA_CON),y)
 diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
-index 69864b1..77c1feb 100644
+index 6b7c8fb..6b4d555 100644
 --- a/drivers/video/console/bitblit.c
 +++ b/drivers/video/console/bitblit.c
 @@ -17,6 +17,7 @@
@@ -820,6 +820,380 @@
 +	}
 +}
 +
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 3681c6a..f3da96a 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -80,6 +80,7 @@
+ #include <asm/system.h>
+ 
+ #include "fbcon.h"
++#include "fbcondecor.h"
+ 
+ #ifdef FBCONDEBUG
+ #  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
+@@ -95,7 +96,7 @@ enum {
+ 
+ static struct display fb_display[MAX_NR_CONSOLES];
+ 
+-static signed char con2fb_map[MAX_NR_CONSOLES];
++signed char con2fb_map[MAX_NR_CONSOLES];
+ static signed char con2fb_map_boot[MAX_NR_CONSOLES];
+ 
+ static int logo_lines;
+@@ -286,7 +287,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
+ 		vc->vc_mode != KD_TEXT || ops->graphics);
+ }
+ 
+-static inline int get_color(struct vc_data *vc, struct fb_info *info,
++inline int get_color(struct vc_data *vc, struct fb_info *info,
+ 	      u16 c, int is_fg)
+ {
+ 	int depth = fb_get_color_depth(&info->var, &info->fix);
+@@ -391,6 +392,7 @@ static void fb_flashcursor(struct work_struct *work)
+ 		CM_ERASE : CM_DRAW;
+ 	ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
+ 		    get_color(vc, info, c, 0));
++	
+ 	release_console_sem();
+ }
+ 
+@@ -527,6 +529,9 @@ static int search_for_mapped_con(void)
+ static int fbcon_takeover(int show_logo)
+ {
+ 	int err, i;
++#ifdef CONFIG_FB_CON_DECOR
++	struct fb_info *info;
++#endif
+ 
+ 	if (!num_registered_fb)
+ 		return -ENODEV;
+@@ -547,6 +552,12 @@ static int fbcon_takeover(int show_logo)
+ 		info_idx = -1;
+ 	} else {
+ 		fbcon_has_console_bind = 1;
++#ifdef CONFIG_FB_CON_DECOR
++		info = registered_fb[info_idx];
++		unlock_fb_info(info);
++		fbcon_decor_init();
++		lock_fb_info(info);
++#endif
+ 	}
+ 
+ 	return err;
+@@ -1001,6 +1012,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;
++
++	if (fbcon_decor_active(info, vc)) {
++		cols = vc->vc_decor.twidth / vc->vc_font.width;
++		rows = vc->vc_decor.theight / vc->vc_font.height;
++	}
++
+ 	vc_resize(vc, cols, rows);
+ 
+ 	DPRINTK("mode:   %s\n", info->fix.id);
+@@ -1030,7 +1047,7 @@ static void fbcon_init(struct vc_data *vc, int init)
+ 	cap = info->flags;
+ 
+ 	if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
+-	    (info->fix.type == FB_TYPE_TEXT))
++	    (info->fix.type == FB_TYPE_TEXT) || fbcon_decor_active(info, vc))
+ 		logo = 0;
+ 
+ 	if (var_to_display(p, &info->var, info))
+@@ -1239,6 +1256,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;
+ 
++ 	if (fbcon_decor_active(info, vc)) {
++ 		fbcon_decor_clear(vc, info, sy, sx, height, width);
++ 		return;
++ 	}
++ 	
+ 	/* Split blits that cross physical y_wrap boundary */
+ 
+ 	y_break = p->vrows - p->yscroll;
+@@ -1258,10 +1280,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;
+ 
+-	if (!fbcon_is_inactive(vc, info))
+-		ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
+-			   get_color(vc, info, scr_readw(s), 1),
+-			   get_color(vc, info, scr_readw(s), 0));
++	if (!fbcon_is_inactive(vc, info)) {
++		
++		if (fbcon_decor_active(info, vc))
++			fbcon_decor_putcs(vc, info, s, count, ypos, xpos);
++		else
++			ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
++				   get_color(vc, info, scr_readw(s), 1),
++				   get_color(vc, info, scr_readw(s), 0));
++	}
+ }
+ 
+ static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
+@@ -1277,8 +1304,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;
+ 
+-	if (!fbcon_is_inactive(vc, info))
+-		ops->clear_margins(vc, info, bottom_only);
++	if (!fbcon_is_inactive(vc, info)) {
++	 	if (fbcon_decor_active(info, vc)) {
++	 		fbcon_decor_clear_margins(vc, info, bottom_only);
++ 		} else {
++			ops->clear_margins(vc, info, bottom_only);
++		}
++	}
+ }
+ 
+ static void fbcon_cursor(struct vc_data *vc, int mode)
+@@ -1798,7 +1830,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);
+-		if (logo_shown >= 0)
++		if (logo_shown >= 0 || fbcon_decor_active(info, vc))
+ 			goto redraw_up;
+ 		switch (p->scrollmode) {
+ 		case SCROLL_MOVE:
+@@ -1891,6 +1923,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;
++		if (fbcon_decor_active(info, vc))
++			goto redraw_down;
+ 		switch (p->scrollmode) {
+ 		case SCROLL_MOVE:
+ 			fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
+@@ -2039,6 +2073,13 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
+ 		}
+ 		return;
+ 	}
++
++	if (fbcon_decor_active(info, vc) && sy == dy && height == 1) {
++ 		/* must use slower redraw bmove to keep background pic intact */
++ 		fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width);
++ 		return;
++ 	}
++	
+ 	ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
+ 		   height, width);
+ }
+@@ -2109,8 +2150,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;
+-	if (x_diff < 0 || x_diff > virt_fw ||
+-	    y_diff < 0 || y_diff > virt_fh) {
++	if ((x_diff < 0 || x_diff > virt_fw ||
++		y_diff < 0 || y_diff > virt_fh) && !vc->vc_decor.state) {
+ 		const struct fb_videomode *mode;
+ 
+ 		DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
+@@ -2146,6 +2187,21 @@ static int fbcon_switch(struct vc_data *vc)
+ 
+ 	info = registered_fb[con2fb_map[vc->vc_num]];
+ 	ops = info->fbcon_par;
++	prev_console = ops->currcon;
++	if (prev_console != -1)
++		old_info = registered_fb[con2fb_map[prev_console]];
++
++#ifdef CONFIG_FB_CON_DECOR
++	if (!fbcon_decor_active_vc(vc) && info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
++		struct vc_data *vc_curr = vc_cons[prev_console].d;
++		if (vc_curr && fbcon_decor_active_vc(vc_curr)) {
++			/* Clear the screen to avoid displaying funky colors during
++			 * palette updates. */
++			memset((u8*)info->screen_base + info->fix.line_length * info->var.yoffset,
++			       0, info->var.yres * info->fix.line_length);
++		}
++	}
++#endif
+ 
+ 	if (softback_top) {
+ 		if (softback_lines)
+@@ -2164,9 +2220,6 @@ static int fbcon_switch(struct vc_data *vc)
+ 		logo_shown = FBCON_LOGO_CANSHOW;
+ 	}
+ 
+-	prev_console = ops->currcon;
+-	if (prev_console != -1)
+-		old_info = registered_fb[con2fb_map[prev_console]];
+ 	/*
+ 	 * FIXME: If we have multiple fbdev's loaded, we need to
+ 	 * update all info->currcon.  Perhaps, we can place this
+@@ -2210,6 +2263,18 @@ static int fbcon_switch(struct vc_data *vc)
+ 			fbcon_del_cursor_timer(old_info);
+ 	}
+ 
++	if (fbcon_decor_active_vc(vc)) {
++		struct vc_data *vc_curr = vc_cons[prev_console].d;
++
++		if (!vc_curr->vc_decor.theme ||
++			strcmp(vc->vc_decor.theme, vc_curr->vc_decor.theme) ||
++			(fbcon_decor_active_nores(info, vc_curr) &&
++			 !fbcon_decor_active(info, vc_curr))) {
++			if (fbcon_decor_call_helper("modechange", vc->vc_num))
++				fbcon_decor_disable(vc, 0);
++		}
++	}
++
+ 	if (fbcon_is_inactive(vc, info) ||
+ 	    ops->blank_state != FB_BLANK_UNBLANK)
+ 		fbcon_del_cursor_timer(info);
+@@ -2318,15 +2383,20 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
+ 		}
+ 	}
+ 
+- 	if (!fbcon_is_inactive(vc, info)) {
++	if (!fbcon_is_inactive(vc, info)) {
+ 		if (ops->blank_state != blank) {
+ 			ops->blank_state = blank;
+ 			fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
+ 			ops->cursor_flash = (!blank);
+ 
+-			if (!(info->flags & FBINFO_MISC_USEREVENT))
+-				if (fb_blank(info, blank))
+-					fbcon_generic_blank(vc, info, blank);
++			if (!(info->flags & FBINFO_MISC_USEREVENT)) {
++				if (fb_blank(info, blank)) {
++					if (fbcon_decor_active(info, vc))
++						fbcon_decor_blank(vc, info, blank);
++					else
++						fbcon_generic_blank(vc, info, blank);
++				}
++			}
+ 		}
+ 
+ 		if (!blank)
+@@ -2477,13 +2547,22 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
+ 	}
+ 
+ 	if (resize) {
++		/* 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);
++
++		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;
++		}
+ 		cols /= w;
+ 		rows /= h;
++
+ 		vc_resize(vc, cols, rows);
++
+ 		if (CON_IS_VISIBLE(vc) && softback_buf)
+ 			fbcon_update_softback(vc);
+ 	} else if (CON_IS_VISIBLE(vc)
+@@ -2612,7 +2691,11 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
+ 	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
++		)
+ 		return -EINVAL;
+ 
+ 	if (!CON_IS_VISIBLE(vc))
+@@ -2638,7 +2721,49 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
+ 	} else
+ 		fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
+ 
+-	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)
+@@ -2846,7 +2971,7 @@ static void fbcon_modechanged(struct fb_info *info)
+ 	struct fbcon_ops *ops = info->fbcon_par;
+ 	struct vc_data *vc;
+ 	struct display *p;
+-	int rows, cols;
++	int rows, cols, res;
+ 
+ 	if (!ops || ops->currcon < 0)
+ 		return;
+@@ -2864,7 +2989,18 @@ 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;
+-		vc_resize(vc, cols, rows);
++
++		if (!fbcon_decor_active_nores(info, vc)) {
++			vc_resize(vc, cols, rows);
++		} else {
++			/* HACK: Do this properly at some point.. */
++			unlock_fb_info(info);
++			res = fbcon_decor_call_helper("modechange", vc->vc_num);
++			lock_fb_info(info);
++			if (res)
++				fbcon_decor_disable(vc, 0);
++		}
++
+ 		updatescrollmode(p, info, vc);
+ 		scrollback_max = 0;
+ 		scrollback_current = 0;
+@@ -3498,6 +3634,7 @@ static void fbcon_exit(void)
+ 		}
+ 	}
+ 
++	fbcon_decor_exit();
+ 	fbcon_has_exited = 1;
+ }
+ 
 diff --git a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondecor.c
 new file mode 100644
 index 0000000..a0b4ae3
@@ -1506,10 +1880,10 @@
  }
  
 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index a85c818..1f1c24b 100644
+index 99bbd28..893bca4 100644
 --- a/drivers/video/fbmem.c
 +++ b/drivers/video/fbmem.c
-@@ -1173,15 +1173,6 @@ struct fb_fix_screeninfo32 {
+@@ -1184,15 +1184,6 @@ struct fb_fix_screeninfo32 {
  	u16			reserved[3];
  };
  
@@ -1599,7 +1973,7 @@
  };
  
 diff --git a/include/linux/fb.h b/include/linux/fb.h
-index f847df9..7ac118e 100644
+index 369767b..2c14913 100644
 --- a/include/linux/fb.h
 +++ b/include/linux/fb.h
 @@ -3,13 +3,31 @@
@@ -1660,7 +2034,7 @@
  
  #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
  #define FB_TYPE_PLANES			1	/* Non interleaved planes */
-@@ -281,6 +316,28 @@ struct fb_cmap {
+@@ -282,6 +317,28 @@ struct fb_cmap {
  	__u16 *transp;			/* transparency, can be NULL */
  };
  
@@ -1689,7 +2063,7 @@
  struct fb_con2fbmap {
  	__u32 console;
  	__u32 framebuffer;
-@@ -362,6 +419,34 @@ struct fb_image {
+@@ -363,6 +420,34 @@ struct fb_image {
  	struct fb_cmap cmap;	/* color map info */
  };
  
@@ -1724,7 +2098,7 @@
  /*
   * hardware cursor control
   */
-@@ -859,6 +944,9 @@ struct fb_info {
+@@ -855,6 +940,9 @@ struct fb_info {
  #define FBINFO_STATE_SUSPENDED	1
  	u32 state;			/* Hardware state i.e suspend */
  	void *fbcon_par;                /* fbcon use-only private area */
@@ -1735,10 +2109,10 @@
  	void *par;
  	/* we need the PCI or similiar aperture base/size not
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 98e0232..24f4e31 100644
+index 8a68b24..3232e2f 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -118,6 +118,9 @@ static int ngroups_max = NGROUPS_MAX;
+@@ -123,6 +123,9 @@ static int ngroups_max = NGROUPS_MAX;
  extern char modprobe_path[];
  extern int modules_disabled;
  #endif
@@ -1748,383 +2122,21 @@
  #ifdef CONFIG_CHR_DEV_SG
  extern int sg_big_buff;
  #endif
-@@ -230,6 +233,18 @@ static struct ctl_table root_table[] = {
+@@ -232,6 +235,16 @@ static struct ctl_table root_table[] = {
  		.mode		= 0555,
  		.child		= dev_table,
  	},
 +#ifdef CONFIG_FB_CON_DECOR
 +	{
-+		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "fbcondecor",
 +		.data		= &fbcon_decor_path,
 +		.maxlen		= KMOD_PATH_LEN,
 +		.mode		= 0644,
 +		.proc_handler	= &proc_dostring,
-+		.strategy	= &sysctl_string,
 +	},
 +#endif
 +
  /*
   * NOTE: do not add new entries to this table unless you have read
   * Documentation/sysctl/ctl_unnumbered.txt
---- a/drivers/video/console/fbcon.c	2009-10-07 20:24:23.000000000 -0400
-+++ b/drivers/video/console/fbcon.c	2009-10-07 20:23:26.000000000 -0400
-@@ -80,6 +80,7 @@
- #include <asm/system.h>
- 
- #include "fbcon.h"
-+#include "fbcondecor.h"
- 
- #ifdef FBCONDEBUG
- #  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
-@@ -95,7 +96,7 @@ enum {
- 
- static struct display fb_display[MAX_NR_CONSOLES];
- 
--static signed char con2fb_map[MAX_NR_CONSOLES];
-+signed char con2fb_map[MAX_NR_CONSOLES];
- static signed char con2fb_map_boot[MAX_NR_CONSOLES];
- 
- static int logo_lines;
-@@ -286,7 +287,7 @@ static inline int fbcon_is_inactive(stru
- 		vc->vc_mode != KD_TEXT || ops->graphics);
- }
- 
--static inline int get_color(struct vc_data *vc, struct fb_info *info,
-+inline int get_color(struct vc_data *vc, struct fb_info *info,
- 	      u16 c, int is_fg)
- {
- 	int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -391,6 +392,7 @@ static void fb_flashcursor(struct work_s
- 		CM_ERASE : CM_DRAW;
- 	ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
- 		    get_color(vc, info, c, 0));
-+	
- 	release_console_sem();
- }
- 
-@@ -527,6 +529,7 @@ static int search_for_mapped_con(void)
- static int fbcon_takeover(int show_logo)
- {
- 	int err, i;
-+	struct fb_info *info;
- 
- 	if (!num_registered_fb)
- 		return -ENODEV;
-@@ -540,6 +543,8 @@ static int fbcon_takeover(int show_logo)
- 	err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
- 				fbcon_is_default);
- 
-+    info = registered_fb[info_idx];
-+
- 	if (err) {
- 		for (i = first_fb_vc; i <= last_fb_vc; i++) {
- 			con2fb_map[i] = -1;
-@@ -547,6 +552,9 @@ static int fbcon_takeover(int show_logo)
- 		info_idx = -1;
- 	} else {
- 		fbcon_has_console_bind = 1;
-+		unlock_fb_info(info);
-+		fbcon_decor_init();
-+		lock_fb_info(info);
- 	}
- 
- 	return err;
-@@ -988,6 +996,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;
-+
-+	if (fbcon_decor_active(info, vc)) {
-+		cols = vc->vc_decor.twidth / vc->vc_font.width;
-+		rows = vc->vc_decor.theight / vc->vc_font.height;
-+	}
-+
- 	vc_resize(vc, cols, rows);
- 
- 	DPRINTK("mode:   %s\n", info->fix.id);
-@@ -1017,7 +1031,7 @@ static void fbcon_init(struct vc_data *v
- 	cap = info->flags;
- 
- 	if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
--	    (info->fix.type == FB_TYPE_TEXT))
-+	    (info->fix.type == FB_TYPE_TEXT) || fbcon_decor_active(info, vc))
- 		logo = 0;
- 
- 	if (var_to_display(p, &info->var, info))
-@@ -1219,6 +1233,11 @@ static void fbcon_clear(struct vc_data *
- 	if (sy < vc->vc_top && vc->vc_top == logo_lines)
- 		vc->vc_top = 0;
- 
-+ 	if (fbcon_decor_active(info, vc)) {
-+ 		fbcon_decor_clear(vc, info, sy, sx, height, width);
-+ 		return;
-+ 	}
-+ 	
- 	/* Split blits that cross physical y_wrap boundary */
- 
- 	y_break = p->vrows - p->yscroll;
-@@ -1238,10 +1257,15 @@ static void fbcon_putcs(struct vc_data *
- 	struct display *p = &fb_display[vc->vc_num];
- 	struct fbcon_ops *ops = info->fbcon_par;
- 
--	if (!fbcon_is_inactive(vc, info))
--		ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
--			   get_color(vc, info, scr_readw(s), 1),
--			   get_color(vc, info, scr_readw(s), 0));
-+	if (!fbcon_is_inactive(vc, info)) {
-+		
-+		if (fbcon_decor_active(info, vc))
-+			fbcon_decor_putcs(vc, info, s, count, ypos, xpos);
-+		else
-+			ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
-+				   get_color(vc, info, scr_readw(s), 1),
-+				   get_color(vc, info, scr_readw(s), 0));
-+	}
- }
- 
- static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
-@@ -1257,8 +1281,13 @@ static void fbcon_clear_margins(struct v
- 	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
- 	struct fbcon_ops *ops = info->fbcon_par;
- 
--	if (!fbcon_is_inactive(vc, info))
--		ops->clear_margins(vc, info, bottom_only);
-+	if (!fbcon_is_inactive(vc, info)) {
-+	 	if (fbcon_decor_active(info, vc)) {
-+	 		fbcon_decor_clear_margins(vc, info, bottom_only);
-+ 		} else {
-+			ops->clear_margins(vc, info, bottom_only);
-+		}
-+	}
- }
- 
- static void fbcon_cursor(struct vc_data *vc, int mode)
-@@ -1778,7 +1807,7 @@ static int fbcon_scroll(struct vc_data *
- 			count = vc->vc_rows;
- 		if (softback_top)
- 			fbcon_softback_note(vc, t, count);
--		if (logo_shown >= 0)
-+		if (logo_shown >= 0 || fbcon_decor_active(info, vc))
- 			goto redraw_up;
- 		switch (p->scrollmode) {
- 		case SCROLL_MOVE:
-@@ -1871,6 +1900,8 @@ static int fbcon_scroll(struct vc_data *
- 			count = vc->vc_rows;
- 		if (logo_shown >= 0)
- 			goto redraw_down;
-+		if (fbcon_decor_active(info, vc))
-+			goto redraw_down;
- 		switch (p->scrollmode) {
- 		case SCROLL_MOVE:
- 			fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
-@@ -2019,6 +2050,13 @@ static void fbcon_bmove_rec(struct vc_da
- 		}
- 		return;
- 	}
-+
-+	if (fbcon_decor_active(info, vc) && sy == dy && height == 1) {
-+ 		/* must use slower redraw bmove to keep background pic intact */
-+ 		fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width);
-+ 		return;
-+ 	}
-+	
- 	ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
- 		   height, width);
- }
-@@ -2089,8 +2127,8 @@ static int fbcon_resize(struct vc_data *
- 	var.yres = virt_h * virt_fh;
- 	x_diff = info->var.xres - var.xres;
- 	y_diff = info->var.yres - var.yres;
--	if (x_diff < 0 || x_diff > virt_fw ||
--	    y_diff < 0 || y_diff > virt_fh) {
-+	if ((x_diff < 0 || x_diff > virt_fw ||
-+		y_diff < 0 || y_diff > virt_fh) && !vc->vc_decor.state) {
- 		const struct fb_videomode *mode;
- 
- 		DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
-@@ -2126,6 +2164,19 @@ static int fbcon_switch(struct vc_data *
- 
- 	info = registered_fb[con2fb_map[vc->vc_num]];
- 	ops = info->fbcon_par;
-+	prev_console = ops->currcon;
-+	if (prev_console != -1)
-+		old_info = registered_fb[con2fb_map[prev_console]];
-+
-+	if (!fbcon_decor_active_vc(vc) && info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-+		struct vc_data *vc_curr = vc_cons[prev_console].d;
-+		if (vc_curr && fbcon_decor_active_vc(vc_curr)) {
-+			/* Clear the screen to avoid displaying funky colors during
-+			 * palette updates. */
-+			memset((u8*)info->screen_base + info->fix.line_length * info->var.yoffset,
-+			       0, info->var.yres * info->fix.line_length);
-+		}
-+	}
- 
- 	if (softback_top) {
- 		if (softback_lines)
-@@ -2144,9 +2195,6 @@ static int fbcon_switch(struct vc_data *
- 		logo_shown = FBCON_LOGO_CANSHOW;
- 	}
- 
--	prev_console = ops->currcon;
--	if (prev_console != -1)
--		old_info = registered_fb[con2fb_map[prev_console]];
- 	/*
- 	 * FIXME: If we have multiple fbdev's loaded, we need to
- 	 * update all info->currcon.  Perhaps, we can place this
-@@ -2184,6 +2232,18 @@ static int fbcon_switch(struct vc_data *
- 			fbcon_del_cursor_timer(old_info);
- 	}
- 
-+	if (fbcon_decor_active_vc(vc)) {
-+		struct vc_data *vc_curr = vc_cons[prev_console].d;
-+
-+		if (!vc_curr->vc_decor.theme ||
-+			strcmp(vc->vc_decor.theme, vc_curr->vc_decor.theme) ||
-+			(fbcon_decor_active_nores(info, vc_curr) &&
-+			 !fbcon_decor_active(info, vc_curr))) {
-+			if (fbcon_decor_call_helper("modechange", vc->vc_num))
-+				fbcon_decor_disable(vc, 0);
-+		}
-+	}
-+
- 	if (fbcon_is_inactive(vc, info) ||
- 	    ops->blank_state != FB_BLANK_UNBLANK)
- 		fbcon_del_cursor_timer(info);
-@@ -2295,15 +2355,20 @@ static int fbcon_blank(struct vc_data *v
- 			info->fbops->fb_restore_state(info);
- 	}
- 
-- 	if (!fbcon_is_inactive(vc, info)) {
-+	if (!fbcon_is_inactive(vc, info)) {
- 		if (ops->blank_state != blank) {
- 			ops->blank_state = blank;
- 			fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
- 			ops->cursor_flash = (!blank);
- 
--			if (!(info->flags & FBINFO_MISC_USEREVENT))
--				if (fb_blank(info, blank))
--					fbcon_generic_blank(vc, info, blank);
-+			if (!(info->flags & FBINFO_MISC_USEREVENT)) {
-+				if (fb_blank(info, blank)) {
-+					if (fbcon_decor_active(info, vc))
-+						fbcon_decor_blank(vc, info, blank);
-+					else
-+						fbcon_generic_blank(vc, info, blank);
-+				}
-+			}
- 		}
- 
- 		if (!blank)
-@@ -2454,13 +2519,22 @@ static int fbcon_do_set_font(struct vc_d
- 	}
- 
- 	if (resize) {
-+		/* 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);
-+
-+ 		info->var.xoffset = info->var.yoffset = p->yscroll = 0;
-+		if (fbcon_decor_active(info, vc)) {
-+			cols = vc->vc_decor.twidth;
-+			rows = vc->vc_decor.theight;
-+		}
- 		cols /= w;
- 		rows /= h;
-+
- 		vc_resize(vc, cols, rows);
-+
- 		if (CON_IS_VISIBLE(vc) && softback_buf)
- 			fbcon_update_softback(vc);
- 	} else if (CON_IS_VISIBLE(vc)
-@@ -2589,7 +2663,7 @@ static int fbcon_set_palette(struct vc_d
- 	int i, j, k, depth;
- 	u8 val;
- 
--	if (fbcon_is_inactive(vc, info))
-+	if (fbcon_is_inactive(vc, info) || vc->vc_num != fg_console)
- 		return -EINVAL;
- 
- 	if (!CON_IS_VISIBLE(vc))
-@@ -2615,7 +2689,49 @@ static int fbcon_set_palette(struct vc_d
- 	} else
- 		fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
- 
--	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)
-@@ -2841,7 +2957,18 @@ static void fbcon_modechanged(struct fb_
- 		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 (!fbcon_decor_active_nores(info, vc)) {
-+			vc_resize(vc, cols, rows);
-+		} else {
-+			/* HACK: Do this properly at some point.. */
-+			unlock_fb_info(info);
-+			int res = fbcon_decor_call_helper("modechange", vc->vc_num);
-+			lock_fb_info(info);
-+			if (res)
-+				fbcon_decor_disable(vc, 0);
-+		}
-+
- 		updatescrollmode(p, info, vc);
- 		scrollback_max = 0;
- 		scrollback_current = 0;
-@@ -3475,6 +3602,7 @@ static void fbcon_exit(void)
- 		}
- 	}
- 
-+	fbcon_decor_exit();
- 	fbcon_has_exited = 1;
- }
- 
+

Added: genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch
===================================================================
--- genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch	2010-02-25 00:12:16 UTC (rev 1686)
@@ -0,0 +1,163 @@
+Index: linux-2.6.26-gentoo/arch/alpha/Kconfig
+===================================================================
+--- linux-2.6.26-gentoo.orig/arch/alpha/Kconfig
++++ linux-2.6.26-gentoo/arch/alpha/Kconfig
+@@ -624,6 +624,32 @@ config HZ
+ 	default 1200 if ALPHA_RAWHIDE
+ 	default 1024
+ 
++config ALPHA_UAC_SYSCTL
++	bool "Configure UAC policy via sysctl"
++	depends on SYSCTL
++	default y
++	---help---
++	  Configuring the UAC (unaligned access control) policy on a Linux
++	  system usually involves setting a compile time define. If you say
++	  Y here, you will be able to modify the UAC policy at runtime using
++	  the /proc interface.
++
++	  The UAC policy defines the action Linux should take when an
++	  unaligned memory access occurs. The action can include printing a
++	  warning message (NOPRINT), sending a signal to the offending
++	  program to help developers debug their applications (SIGBUS), or
++	  disabling the transparent fixing (NOFIX).
++
++	  The sysctls will be initialized to the compile-time defined UAC
++	  policy. You can change these manually, or with the sysctl(8)
++	  userspace utility.
++
++	  To disable the warning messages at runtime, you would use
++
++	    echo 1 > /proc/sys/kernel/uac/noprint
++
++	  This is pretty harmless. Say Y if you're not sure.
++
+ source "drivers/pci/Kconfig"
+ source "drivers/eisa/Kconfig"
+ 
+Index: linux-2.6.26-gentoo/arch/alpha/kernel/traps.c
+===================================================================
+--- linux-2.6.26-gentoo.orig/arch/alpha/kernel/traps.c
++++ linux-2.6.26-gentoo/arch/alpha/kernel/traps.c
+@@ -103,6 +103,52 @@ static char * ireg_name[] = {"v0", "t0",
+ 			   "t10", "t11", "ra", "pv", "at", "gp", "sp", "zero"};
+ #endif
+ 
++#ifdef CONFIG_ALPHA_UAC_SYSCTL
++
++#include <linux/sysctl.h>
++
++static int enabled_noprint = 0;
++static int enabled_sigbus = 0;
++static int enabled_nofix = 0;
++
++ctl_table uac_table[] = {
++   	{
++		.ctl_name 	= CTL_UNNUMBERED,
++		.procname 	= "noprint", 
++		.data 		= &enabled_noprint, 
++		.maxlen 	= sizeof (int), 
++		.mode 		= 0644, 
++		.proc_handler = &proc_dointvec,
++	},
++   	{
++		.ctl_name 	= CTL_UNNUMBERED,
++		.procname 	= "sigbus", 
++		.data 		= &enabled_sigbus, 
++		.maxlen 	= sizeof (int), 
++		.mode 		= 0644, 
++		.proc_handler = &proc_dointvec,
++	},
++   	{
++		.ctl_name 	= CTL_UNNUMBERED,
++		.procname 	= "nofix", 
++		.data 		= &enabled_nofix, 
++		.maxlen 	= sizeof (int), 
++		.mode 		= 0644, 
++		.proc_handler = &proc_dointvec,
++	},
++	{ .ctl_name = 0 }
++};
++
++static int __init init_uac_sysctl(void)
++{
++   /* Initialize sysctls with the #defined UAC policy */
++   enabled_noprint = (test_thread_flag (TIF_UAC_NOPRINT)) ? 1 : 0;
++   enabled_sigbus = (test_thread_flag (TIF_UAC_SIGBUS)) ? 1 : 0;
++   enabled_nofix = (test_thread_flag (TIF_UAC_NOFIX)) ? 1 : 0;
++   return 0;
++}
++#endif
++
+ static void
+ dik_show_code(unsigned int *pc)
+ {
+@@ -782,7 +828,11 @@ do_entUnaUser(void __user * va, unsigned
+ 	/* Check the UAC bits to decide what the user wants us to do
+ 	   with the unaliged access.  */
+ 
++#ifndef CONFIG_ALPHA_UAC_SYSCTL
+ 	if (!test_thread_flag (TIF_UAC_NOPRINT)) {
++#else  /* CONFIG_ALPHA_UAC_SYSCTL */
++	if (!(enabled_noprint)) {
++#endif /* CONFIG_ALPHA_UAC_SYSCTL */
+ 		if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {
+ 			cnt = 0;
+ 		}
+@@ -793,10 +843,18 @@ do_entUnaUser(void __user * va, unsigned
+ 		}
+ 		last_time = jiffies;
+ 	}
++#ifndef CONFIG_ALPHA_UAC_SYSCTL
+ 	if (test_thread_flag (TIF_UAC_SIGBUS))
++#else  /* CONFIG_ALPHA_UAC_SYSCTL */
++   if (enabled_sigbus)
++#endif /* CONFIG_ALPHA_UAC_SYSCTL */
+ 		goto give_sigbus;
+ 	/* Not sure why you'd want to use this, but... */
++#ifndef CONFIG_ALPHA_UAC_SYSCTL
+ 	if (test_thread_flag (TIF_UAC_NOFIX))
++#else  /* CONFIG_ALPHA_UAC_SYSCTL */
++   if (enabled_nofix)
++#endif /* CONFIG_ALPHA_UAC_SYSCTL */
+ 		return;
+ 
+ 	/* Don't bother reading ds in the access check since we already
+@@ -1091,3 +1149,7 @@ trap_init(void)
+ 	wrent(entSys, 5);
+ 	wrent(entDbg, 6);
+ }
++
++#ifdef CONFIG_ALPHA_UAC_SYSCTL
++	__initcall(init_uac_sysctl);
++#endif
+Index: linux-2.6.33-gentoo/kernel/sysctl.c
+===================================================================
+--- a/kernel/sysctl.c	2010-02-24 17:52:58.000000000 -0500
++++ b/kernel/sysctl.c	2010-02-24 17:57:49.000000000 -0500
+@@ -193,6 +193,10 @@ extern struct ctl_table random_table[];
+ #ifdef CONFIG_INOTIFY_USER
+ extern struct ctl_table inotify_table[];
+ #endif
++#ifdef CONFIG_ALPHA_UAC_SYSCTL
++extern struct ctl_table uac_table[];
++#endif
++
+ #ifdef CONFIG_EPOLL
+ extern struct ctl_table epoll_table[];
+ #endif
+@@ -940,6 +944,14 @@ static struct ctl_table kern_table[] = {
+  * NOTE: do not add new entries to this table unless you have read
+  * Documentation/sysctl/ctl_unnumbered.txt
+  */
++#ifdef CONFIG_ALPHA_UAC_SYSCTL
++{
++	.ctl_name   = CTL_UNNUMBERED,
++	.procname   = "uac",
++	.mode       = 0555,
++	.child      = uac_table,
++},
++#endif /* CONFIG_ALPHA_UAC_SYSCTL */
+ 	{ }
+ };
+