packages (LINUX_3_0): kernel/kernel-grsec_fixes.patch - revert wrong change.

[pluto]

Author: pluto                        Date: Sat Jan 21 20:47:24 2012 GMT
Module: packages                      Tag: LINUX_3_0
---- Log message:
- revert wrong change.

---- Files affected:
packages/kernel:
   kernel-grsec_fixes.patch (1.27.2.1 -> 1.27.2.2) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.27.2.1 packages/kernel/kernel-grsec_fixes.patch:1.27.2.2
--- packages/kernel/kernel-grsec_fixes.patch:1.27.2.1	Sat Jan 21 18:26:31 2012
+++ packages/kernel/kernel-grsec_fixes.patch	Sat Jan 21 21:47:18 2012
@@ -120,24 +120,27 @@
  		sock_release(newsock);
 
 
---- linux-3.0/Makefile.orig	2012-01-21 16:35:09.000000000 +0100
-+++ linux-3.0/Makefile	2012-01-21 16:43:27.074323912 +0100
-@@ -568,7 +568,6 @@
- endif
+diff -NurpX linux-3.0.6-pax/Documentation/dontdiff linux-3.0.6/drivers/media/video/timblogiw.c linux-3.0.6-pax/drivers/media/video/timblogiw.c
+--- linux-3.0.6/drivers/media/video/timblogiw.c	2011-07-22 04:17:23.000000000 +0200
++++ linux-3.0.6-pax/drivers/media/video/timblogiw.c	2011-10-09 13:14:45.187928072 +0200
+@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_
+ 	.vidioc_enum_framesizes		= timblogiw_enum_framesizes,
+ };
  
- ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
--CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
- ifdef CONFIG_PAX_MEMORY_STACKLEAK
- STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
- endif
-@@ -583,8 +582,8 @@
- CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
- endif
- endif
--GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
--export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
-+GCC_PLUGINS := $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
-+export STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
- gcc-plugins:
- 	$(Q)$(MAKE) $(build)=tools/gcc
- else
+-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
++static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= timblogiw_open,
+ 	.release	= timblogiw_close,
+
+--- linux-3.0/include/linux/vermagic.h~	2011-10-14 19:55:36.000000000 +0200
++++ linux-3.0/include/linux/vermagic.h	2011-10-16 15:45:11.251098590 +0200
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #ifdef CONSTIFY_PLUGIN
+-#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
++#define MODULE_CONSTIFY_PLUGIN ""
+ #else
+ #define MODULE_CONSTIFY_PLUGIN ""
+ #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.27.2.1&r2=1.27.2.2&f=u