From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 12 Dec 2015 15:31:33 +0000 (+0000)
Subject: kernel: Add grsecurity compile fix
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f295ca0cf75d0b475303a9db905e3ab082290997;p=people%2Fms%2Fipfire-2.x.git

kernel: Add grsecurity compile fix

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/linux b/lfs/linux
index 829b21e3e4..e1d6a4ecb9 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -132,6 +132,7 @@ ifneq "$(KCFG)" "-headers"
 	cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
 	cd $(DIR_APP) && rm localversion-grsec
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-grsec-compile-fixes.patch
 endif
 
 	# DVB Patches
diff --git a/src/patches/kernel-grsec-compile-fixes.patch b/src/patches/kernel-grsec-compile-fixes.patch
new file mode 100644
index 0000000000..530d69e2a1
--- /dev/null
+++ b/src/patches/kernel-grsec-compile-fixes.patch
@@ -0,0 +1,11 @@
+--- a/arch/arm/mach-omap2/cclock3xxx_data.c~	2015-12-12 11:00:10.474423373 +0000
++++ b/arch/arm/mach-omap2/cclock3xxx_data.c	2015-12-12 11:30:31.198452547 +0000
+@@ -250,7 +250,7 @@
+ 
+ static struct clk dpll1_ck;
+ 
+-static struct clk_ops dpll1_ck_ops;
++static clk_ops_no_const dpll1_ck_ops;
+ 
+ static struct clk_ops dpll1_ck_ops_34xx __initdata = {
+ 	.init		= &omap2_init_clk_clkdm,