SOURCES (LINUX_2_6): kernel-fbcondecor.patch - now not conflicting...

[zbyniu]

Author: zbyniu                       Date: Thu Apr 24 10:18:49 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- now not conflicting with grsec_full

---- Files affected:
SOURCES:
   kernel-fbcondecor.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-fbcondecor.patch
diff -u SOURCES/kernel-fbcondecor.patch:1.1.2.1 SOURCES/kernel-fbcondecor.patch:1.1.2.2
--- SOURCES/kernel-fbcondecor.patch:1.1.2.1	Thu Apr 24 12:17:40 2008
+++ SOURCES/kernel-fbcondecor.patch	Thu Apr 24 12:18:43 2008
@@ -1668,15 +1668,6 @@
  	return rc;
  }
  
-@@ -249,7 +254,7 @@ int fb_set_user_cmap(struct fb_cmap_user
- {
- 	int rc, size = cmap->len * sizeof(u16);
- 	struct fb_cmap umap;
--
-+	
- 	if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
- 			        !info->fbops->fb_setcmap))
- 		return -EINVAL;
 diff -Naurp linux-orig/drivers/video/Kconfig linux-fbcondecor/drivers/video/Kconfig
 --- linux-orig/drivers/video/Kconfig	2008-01-12 12:16:05.000000000 +0100
 +++ linux-fbcondecor/drivers/video/Kconfig	2008-01-24 10:08:34.000000000 +0100
@@ -1782,10 +1773,10 @@
  #ifdef CONFIG_CHR_DEV_SG
  extern int sg_big_buff;
  #endif
-@@ -775,6 +778,18 @@ static struct ctl_table kern_table[] = {
- 		.proc_handler	= &proc_dostring,
- 		.strategy	= &sysctl_string,
+@@ -775,6 +778,17 @@ static struct ctl_table kern_table[] = {
+ 		.proc_handler   = &proc_dointvec,
  	},
+ #endif
 +#ifdef CONFIG_FB_CON_DECOR
 +	{
 +		.ctl_name	= CTL_UNNUMBERED,
@@ -1797,7 +1788,6 @@
 +		.strategy	= &sysctl_string,
 +	},
 +#endif
-+
- /*
-  * NOTE: do not add new entries to this table unless you have read
-  * Documentation/sysctl/ctl_unnumbered.txt
+ 	{
+ 		.ctl_name	= CTL_UNNUMBERED,
+ 		.procname	= "poweroff_cmd",
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-fbcondecor.patch?r1=1.1.2.1&r2=1.1.2.2&f=u