]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
kernel: Add grsecurity compile fix
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 12 Dec 2015 15:31:33 +0000 (15:31 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Dec 2015 13:58:46 +0000 (13:58 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/linux
src/patches/kernel-grsec-compile-fixes.patch [new file with mode: 0644]

index 829b21e3e4d1d0e83a2cd1914c4fb8a778ca7033..e1d6a4ecb9a3dfd89339b4f7af787e1c162f5365 100644 (file)
--- 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 (file)
index 0000000..530d69e
--- /dev/null
@@ -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,