From f1ef0b92bef17f09fe61e1d2e8275d5fdb4c9cc8 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 1 Dec 2013 09:59:53 +0000 Subject: kernel: update 3.10 to 3.10.21 Signed-off-by: Gabor Juhos SVN-Revision: 38972 --- .../patches-3.10/203-kallsyms_uncompressed.patch | 22 +++++++++++----------- ...jecting-with-source-address-failed-policy.patch | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch b/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch index ac9aa54257..42f3fa226e 100644 --- a/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch @@ -6,9 +6,9 @@ static int all_symbols = 0; +static int uncompressed = 0; static char symbol_prefix_char = '\0'; + static unsigned long long kernel_start_addr = 0; - int token_profit[0x10000]; -@@ -360,6 +361,9 @@ static void write_src(void) +@@ -367,6 +368,9 @@ static void write_src(void) free(markers); @@ -18,7 +18,7 @@ output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -418,6 +422,9 @@ static void *find_token(unsigned char *s +@@ -425,6 +429,9 @@ static void *find_token(unsigned char *s { int i; @@ -28,7 +28,7 @@ for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -490,6 +497,9 @@ static void optimize_result(void) +@@ -497,6 +504,9 @@ static void optimize_result(void) { int i, best; @@ -38,10 +38,10 @@ /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -646,7 +656,9 @@ int main(int argc, char **argv) - if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\'')) - p++; - symbol_prefix_char = *p; +@@ -656,7 +666,9 @@ int main(int argc, char **argv) + } else if (strncmp(argv[i], "--page-offset=", 14) == 0) { + const char *p = &argv[i][14]; + kernel_start_addr = strtoull(p, NULL, 16); - } else + } else if (strcmp(argv[i], "--uncompressed") == 0) + uncompressed = 1; @@ -71,9 +71,9 @@ --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh -@@ -82,6 +82,10 @@ kallsyms() - kallsymopt="${kallsymopt} --all-symbols" - fi +@@ -84,6 +84,10 @@ kallsyms() + + kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET" + if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then + kallsymopt="${kallsymopt} --uncompressed" diff --git a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 4614d8ebaf..7e8e526612 100644 --- a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -127,7 +127,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -1505,6 +1523,9 @@ int ip6_route_add(struct fib6_config *cf +@@ -1508,6 +1526,9 @@ int ip6_route_add(struct fib6_config *cf case RTN_THROW: rt->dst.error = -EAGAIN; break; @@ -137,7 +137,7 @@ default: rt->dst.error = -ENETUNREACH; break; -@@ -2084,6 +2105,17 @@ static int ip6_pkt_prohibit_out(struct s +@@ -2087,6 +2108,17 @@ static int ip6_pkt_prohibit_out(struct s return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -155,7 +155,7 @@ #endif /* -@@ -2290,7 +2322,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -2293,7 +2325,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -165,7 +165,7 @@ cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -2492,6 +2525,9 @@ static int rt6_fill_node(struct net *net +@@ -2495,6 +2528,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -175,7 +175,7 @@ case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -2742,6 +2778,8 @@ static int ip6_route_dev_notify(struct n +@@ -2745,6 +2781,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -184,7 +184,7 @@ net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -3002,6 +3040,17 @@ static int __net_init ip6_route_net_init +@@ -3005,6 +3043,17 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -202,7 +202,7 @@ #endif net->ipv6.sysctl.flush_delay = 0; -@@ -3020,6 +3069,8 @@ out: +@@ -3023,6 +3072,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -211,7 +211,7 @@ out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -3037,6 +3088,7 @@ static void __net_exit ip6_route_net_exi +@@ -3040,6 +3091,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); @@ -219,7 +219,7 @@ #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -3133,6 +3185,9 @@ int __init ip6_route_init(void) +@@ -3136,6 +3188,9 @@ int __init ip6_route_init(void) init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); -- cgit v1.2.3