mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-11 03:25:54 +02:00
kernel: update arm-multi grsec compile fix patch
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
diff -Naur linux-3.14.74.org/arch/arm/mach-omap2/cclock3xxx_data.c linux-3.14.74/arch/arm/mach-omap2/cclock3xxx_data.c
|
||||
--- linux-3.14.74.org/arch/arm/mach-omap2/cclock3xxx_data.c 2016-07-27 18:56:02.000000000 +0200
|
||||
+++ linux-3.14.74/arch/arm/mach-omap2/cclock3xxx_data.c 2016-07-29 01:47:45.272515907 +0200
|
||||
diff -Naur linux-3.14.76.org/arch/arm/mach-omap2/cclock3xxx_data.c linux-3.14.76/arch/arm/mach-omap2/cclock3xxx_data.c
|
||||
--- linux-3.14.76.org/arch/arm/mach-omap2/cclock3xxx_data.c 2016-08-18 06:26:02.000000000 +0200
|
||||
+++ linux-3.14.76/arch/arm/mach-omap2/cclock3xxx_data.c 2016-08-18 06:37:51.442186995 +0200
|
||||
@@ -250,7 +250,7 @@
|
||||
|
||||
static struct clk dpll1_ck;
|
||||
|
||||
-static const struct clk_ops dpll1_ck_ops = {
|
||||
+static clk_ops_no_const dpll1_ck_ops = {
|
||||
-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,
|
||||
.enable = &omap3_noncore_dpll_enable,
|
||||
.disable = &omap3_noncore_dpll_disable,
|
||||
diff -Naur linux-3.14.74.org/net/ipv6/addrconf.c linux-3.14.74/net/ipv6/addrconf.c
|
||||
--- linux-3.14.74.org/net/ipv6/addrconf.c 2016-07-29 03:47:13.000000000 +0200
|
||||
+++ linux-3.14.74/net/ipv6/addrconf.c 2016-07-29 00:47:00.000000000 +0200
|
||||
diff -Naur linux-3.14.76.org/net/ipv6/addrconf.c linux-3.14.76/net/ipv6/addrconf.c
|
||||
--- linux-3.14.76.org/net/ipv6/addrconf.c 2016-08-18 06:25:51.000000000 +0200
|
||||
+++ linux-3.14.76/net/ipv6/addrconf.c 2016-08-18 06:31:51.802186824 +0200
|
||||
@@ -4818,7 +4818,7 @@
|
||||
{
|
||||
struct inet6_dev *idev = ctl->extra1;
|
||||
|
||||
Reference in New Issue
Block a user