Changeset 44876


Ignore:
Timestamp:
2015-03-18T19:21:08+01:00 (3 years ago)
Author:
nbd
Message:

kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4

also refresh generic patches for 3.14, 3.18, 3.19 and 4.0
targets might need a minor refresh as well, however, it looks
like everything still applies cleanly with occasional small
offsets.

Signed-off-by: Daniel Golle <daniel@…>

Location:
trunk
Files:
42 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r44594 r44876  
    66LINUX_VERSION-3.10 = .58 
    77LINUX_VERSION-3.13 = .7 
    8 LINUX_VERSION-3.14 = .34 
    9 LINUX_VERSION-3.18 = .8 
    10 LINUX_VERSION-3.19 =  
    11 LINUX_VERSION-4.0 = -rc1 
     8LINUX_VERSION-3.14 = .35 
     9LINUX_VERSION-3.18 = .9 
     10LINUX_VERSION-3.19 = .1 
     11LINUX_VERSION-4.0 = -rc4 
    1212 
    1313LINUX_KERNEL_MD5SUM-3.8.13  = 2af19d06cd47ec459519159cdd10542d 
    1414LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01 
    1515LINUX_KERNEL_MD5SUM-3.13.7  = 370adced5e5c1cb1d0d621c2dae2723f 
    16 LINUX_KERNEL_MD5SUM-3.14.34 = 4061154fb66b24a8a1982a8adbe94335 
    17 LINUX_KERNEL_MD5SUM-3.18.8  = 94673d5f4521a6077eb6fe0ab2633b35 
    18 LINUX_KERNEL_MD5SUM-3.19    = d3fc8316d4d4d04b65cbc2d70799e763 
    19 LINUX_KERNEL_MD5SUM-4.0-rc1 = 547b340dca94d358b68d2658822080fa 
     16LINUX_KERNEL_MD5SUM-3.14.35 = e5e92c40d14bc8ae9a8701db4e1cbb27 
     17LINUX_KERNEL_MD5SUM-3.18.9  = 44cd16ada5eb03589f696f083cd2323b 
     18LINUX_KERNEL_MD5SUM-3.19.1  = 90e9cdcaecf587acba4e94904f5f8606 
     19LINUX_KERNEL_MD5SUM-4.0-rc4 = 0e37c076159538ff882f190d87fe9798 
    2020 
    2121ifdef KERNEL_PATCHVER 
  • trunk/target/linux/generic/patches-3.14/532-jffs2_eofdetect.patch

    r38568 r44876  
    3737                if (ret < 0) 
    3838                        goto out; 
    39 @@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct 
     39@@ -561,6 +567,17 @@ full_scan: 
    4040                        return err; 
    4141        } 
  • trunk/target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch

    r44695 r44876  
    190190 #endif /*  CONFIG_IP_FIB_TRIE_STATS */ 
    191191  
    192 @@ -2191,7 +2219,7 @@ static int fib_triestat_seq_show(struct  
     192@@ -2191,7 +2219,7 @@ static int fib_triestat_seq_show(struct 
    193193                        trie_collect_stats(t, &stat); 
    194194                        trie_show_stats(seq, &stat); 
  • trunk/target/linux/generic/patches-3.18/080-03-fib_trie-Make-leaf-and-tnode-more-uniform.patch

    r44695 r44876  
    411411        pr_debug("entering trie_leaf_remove(%p)\n", l); 
    412412  
    413 @@ -2375,7 +2347,7 @@ static int fib_trie_seq_show(struct seq_ 
     413@@ -2374,7 +2346,7 @@ static int fib_trie_seq_show(struct seq_ 
    414414  
    415415        if (IS_TNODE(n)) { 
  • trunk/target/linux/generic/patches-3.18/080-04-fib_trie-Merge-tnode_free-and-leaf_free-into-node_fr.patch

    r44695 r44876  
    8989 { 
    9090        kfree_rcu(leaf, rcu); 
    91 @@ -360,43 +369,24 @@ static struct tnode *tnode_alloc(size_t  
     91@@ -360,43 +369,24 @@ static struct tnode *tnode_alloc(size_t 
    9292                return vzalloc(size); 
    9393 } 
  • trunk/target/linux/generic/patches-3.18/080-05-fib_trie-Merge-leaf-into-tnode.patch

    r44695 r44876  
    824824        seq_printf(seq, "Total size: %u  kB\n", (bytes + 1023) / 1024); 
    825825 } 
    826 @@ -2163,7 +2124,7 @@ static int fib_triestat_seq_show(struct  
     826@@ -2163,7 +2124,7 @@ static int fib_triestat_seq_show(struct 
    827827        seq_printf(seq, 
    828828                   "Basic info: size of leaf:" 
     
    860860        ++*pos; 
    861861        /* next node in same table */ 
    862 @@ -2330,29 +2291,26 @@ static inline const char *rtn_type(char  
     862@@ -2329,29 +2290,26 @@ static inline const char *rtn_type(char 
    863863 static int fib_trie_seq_show(struct seq_file *seq, void *v) 
    864864 { 
     
    897897  
    898898                        list_for_each_entry_rcu(fa, &li->falh, fa_list) { 
    899 @@ -2402,9 +2360,9 @@ struct fib_route_iter { 
     899@@ -2401,9 +2359,9 @@ struct fib_route_iter { 
    900900        t_key   key; 
    901901 }; 
     
    909909  
    910910        /* use cache location of last found key */ 
    911 @@ -2449,7 +2407,7 @@ static void *fib_route_seq_start(struct  
     911@@ -2448,7 +2406,7 @@ static void *fib_route_seq_start(struct 
    912912 static void *fib_route_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
    913913 { 
     
    918918        ++*pos; 
    919919        if (v == SEQ_START_TOKEN) { 
    920 @@ -2495,7 +2453,7 @@ static unsigned int fib_flag_trans(int t 
     920@@ -2494,7 +2452,7 @@ static unsigned int fib_flag_trans(int t 
    921921  */ 
    922922 static int fib_route_seq_show(struct seq_file *seq, void *v) 
  • trunk/target/linux/generic/patches-3.18/080-06-fib_trie-Optimize-fib_table_lookup-to-avoid-wasting-.patch

    r44695 r44876  
    150150                        goto found; 
    151151-               } 
    152   
     152- 
    153153-               cn = n; 
    154 - 
     154  
    155155-               /* 
    156156-                * It's a tnode, and we can do some extra checks here if we 
  • trunk/target/linux/generic/patches-3.18/080-08-fib_trie-Optimize-fib_table_insert.patch

    r44695 r44876  
    8989-        * a T_TNODE might be skipping any number of bits - its 'pos' need 
    9090-        * not be the parent's 'pos'+'bits'! 
    91          * 
     91-        * 
    9292-        * If it does match the current key, get pos/bits from it, extract 
    9393-        * the index from our key, push the T_TNODE and walk the tree. 
    9494-        * 
    9595-        * If it doesn't, we have to replace it with a new T_TNODE. 
    96 -        * 
     96         * 
    9797-        * If we point to a T_LEAF, it might or might not have the same key 
    9898-        * as we do. If it does, just change the value, update the T_LEAF's 
     
    130130                        break; 
    131131-       } 
    132   
     132- 
    133133-       /* 
    134134-        * n  ----> NULL, LEAF or TNODE 
     
    136136-        * tp is n's (parent) ----> NULL or TNODE 
    137137-        */ 
    138 - 
     138  
    139139-       BUG_ON(tp && IS_LEAF(tp)); 
    140140- 
     
    163163-       if (!l) 
    164164-               return NULL; 
    165 - 
     165  
    166166-       li = leaf_info_new(plen); 
    167   
     167- 
    168168-       if (!li) { 
    169169-               node_free(l); 
  • trunk/target/linux/generic/patches-3.18/080-09-fib_trie-Update-meaning-of-pos-to-represent-unchecke.patch

    r44695 r44876  
    307307                        free_leaf_info(li); 
    308308                        node_free(l); 
    309 @@ -1559,12 +1532,7 @@ static int trie_flush_leaf(struct tnode  
     309@@ -1559,12 +1532,7 @@ static int trie_flush_leaf(struct tnode 
    310310 static struct tnode *leaf_walk_rcu(struct tnode *p, struct tnode *c) 
    311311 { 
     
    330330                --iter->depth; 
    331331                goto rescan; 
    332 @@ -2187,10 +2155,10 @@ static int fib_trie_seq_show(struct seq_ 
     332@@ -2186,10 +2154,10 @@ static int fib_trie_seq_show(struct seq_ 
    333333        if (IS_TNODE(n)) { 
    334334                __be32 prf = htonl(n->key); 
  • trunk/target/linux/generic/patches-3.18/080-10-fib_trie-Use-unsigned-long-for-anything-dealing-with.patch

    r44695 r44876  
    135135        int i; 
    136136  
    137 @@ -1532,9 +1530,9 @@ static int trie_flush_leaf(struct tnode  
     137@@ -1532,9 +1530,9 @@ static int trie_flush_leaf(struct tnode 
    138138 static struct tnode *leaf_walk_rcu(struct tnode *p, struct tnode *c) 
    139139 { 
  • trunk/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch

    r44695 r44876  
    4848  
    4949 #else /* CONFIG_IP_MULTIPLE_TABLES */ 
    50 @@ -247,20 +250,25 @@ static inline int fib_lookup(struct net  
     50@@ -247,20 +250,25 @@ static inline int fib_lookup(struct net 
    5151                             struct fib_result *res) 
    5252 { 
     
    165165  
    166166 static void nl_fib_input(struct sk_buff *skb) 
    167 @@ -952,7 +958,6 @@ static void nl_fib_input(struct sk_buff  
     167@@ -952,7 +958,6 @@ static void nl_fib_input(struct sk_buff 
    168168        struct net *net; 
    169169        struct fib_result_nl *frn; 
     
    173173  
    174174        net = sock_net(skb->sk); 
    175 @@ -967,9 +972,7 @@ static void nl_fib_input(struct sk_buff  
     175@@ -967,9 +972,7 @@ static void nl_fib_input(struct sk_buff 
    176176        nlh = nlmsg_hdr(skb); 
    177177  
  • trunk/target/linux/generic/patches-3.18/080-12-fib_trie-Move-resize-to-after-inflate-halve.patch

    r44695 r44876  
    2121 static struct callback_head *tnode_free_head; 
    2222 static size_t tnode_free_size; 
    23 @@ -447,161 +445,6 @@ static void put_child_root(struct tnode  
     23@@ -447,161 +445,6 @@ static void put_child_root(struct tnode 
    2424                rcu_assign_pointer(t->trie, n); 
    2525 } 
  • trunk/target/linux/generic/patches-3.18/080-13-fib_trie-Add-functions-should_inflate-and-should_hal.patch

    r44695 r44876  
    140140  
    141141        if (!tn) 
    142 @@ -668,86 +750,12 @@ static struct tnode *resize(struct trie  
     142@@ -668,86 +750,12 @@ static struct tnode *resize(struct trie 
    143143        /* One child */ 
    144144        if (tn->empty_children == (tnode_child_length(tn) - 1)) 
     
    230230                tn = inflate(t, tn); 
    231231  
    232 @@ -764,16 +772,11 @@ static struct tnode *resize(struct trie  
     232@@ -764,16 +772,11 @@ static struct tnode *resize(struct trie 
    233233        if (max_work != MAX_WORK) 
    234234                return tn; 
  • trunk/target/linux/generic/patches-3.18/080-14-fib_trie-Push-assignment-of-child-to-parent-down-int.patch

    r44695 r44876  
    232232        if (tn->empty_children > (tnode_child_length(tn) - 1)) 
    233233                goto no_children; 
    234 @@ -755,39 +756,35 @@ static struct tnode *resize(struct trie  
     234@@ -755,39 +756,35 @@ static struct tnode *resize(struct trie 
    235235         * nonempty nodes that are above the threshold. 
    236236         */ 
  • trunk/target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch

    r44695 r44876  
    2828  
    2929 /* 
    30 @@ -307,32 +305,6 @@ static struct tnode *tnode_alloc(size_t  
     30@@ -307,32 +305,6 @@ static struct tnode *tnode_alloc(size_t 
    3131                return vzalloc(size); 
    3232 } 
     
    6161 { 
    6262        struct tnode *l = kmem_cache_alloc(trie_leaf_kmem, GFP_KERNEL); 
    63 @@ -433,17 +405,33 @@ static void put_child_root(struct tnode  
     63@@ -433,17 +405,33 @@ static void put_child_root(struct tnode 
    6464                rcu_assign_pointer(t->trie, n); 
    6565 } 
     
    170170 } 
    171171  
    172 @@ -599,17 +593,20 @@ static int halve(struct trie *t, struct  
     172@@ -599,17 +593,20 @@ static int halve(struct trie *t, struct 
    173173                        struct tnode *newn; 
    174174  
     
    193193                struct tnode *newBinNode; 
    194194  
    195 @@ -636,11 +633,14 @@ static int halve(struct trie *t, struct  
     195@@ -636,11 +633,14 @@ static int halve(struct trie *t, struct 
    196196  
    197197                put_child(tn, i / 2, newBinNode); 
  • trunk/target/linux/generic/patches-3.18/080-16-fib_trie-inflate-halve-nodes-in-a-more-RCU-friendly-.patch

    r44695 r44876  
    1818--- a/net/ipv4/fib_trie.c 
    1919+++ b/net/ipv4/fib_trie.c 
    20 @@ -391,8 +391,6 @@ static void put_child(struct tnode *tn,  
     20@@ -391,8 +391,6 @@ static void put_child(struct tnode *tn, 
    2121        else if (!wasfull && isfull) 
    2222                tn->full_children++; 
     
    236236        pr_debug("In halve\n"); 
    237237  
    238 @@ -577,68 +575,64 @@ static int halve(struct trie *t, struct  
     238@@ -577,68 +575,64 @@ static int halve(struct trie *t, struct 
    239239        if (!tn) 
    240240                return -ENOMEM; 
  • trunk/target/linux/generic/patches-3.18/080-18-fib_trie-Add-tracking-value-for-suffix-length.patch

    r44695 r44876  
    4343                tn->bits = bits; 
    4444                tn->key = (shift < KEYLENGTH) ? (key >> shift) << shift : 0; 
    45 @@ -387,6 +390,9 @@ static void put_child(struct tnode *tn,  
     45@@ -387,6 +390,9 @@ static void put_child(struct tnode *tn, 
    4646        else if (!wasfull && isfull) 
    4747                tn->full_children++; 
     
    5353 } 
    5454  
    55 @@ -635,6 +641,41 @@ static int halve(struct trie *t, struct  
     55@@ -635,6 +641,41 @@ static int halve(struct trie *t, struct 
    5656        return 0; 
    5757 } 
     
    121121-static void insert_leaf_info(struct hlist_head *head, struct leaf_info *new) 
    122122+static void leaf_pull_suffix(struct tnode *l) 
    123  { 
     123+{ 
    124124+       struct tnode *tp = node_parent(l); 
    125125+ 
     
    170170+ 
    171171+static void insert_leaf_info(struct tnode *l, struct leaf_info *new) 
    172 +{ 
     172 { 
    173173+       struct hlist_head *head = &l->list; 
    174174        struct leaf_info *li = NULL, *last = NULL; 
  • trunk/target/linux/generic/patches-3.18/080-20-fib_trie-Fix-RCU-bug-and-merge-similar-bits-of-infla.patch

    r44695 r44876  
    3030--- a/net/ipv4/fib_trie.c 
    3131+++ b/net/ipv4/fib_trie.c 
    32 @@ -396,8 +396,30 @@ static void put_child(struct tnode *tn,  
     32@@ -396,8 +396,30 @@ static void put_child(struct tnode *tn, 
    3333        rcu_assign_pointer(tn->child[i], n); 
    3434 } 
     
    151151-       NODE_INIT_PARENT(tn, tp); 
    152152-       put_child_root(tp, t, tn->key, tn); 
    153 - 
     153+       /* setup the parent pointers into and out of this node */ 
     154+       replace(t, oldtnode, tn); 
     155  
    154156-       /* prepare oldtnode to be freed */ 
    155157-       tnode_free_init(oldtnode); 
     
    171173-               node1 = tnode_get_child(tn, 2 * i + 1); 
    172174-               node0 = tnode_get_child(tn, 2 * i); 
    173 +       /* setup the parent pointers into and out of this node */ 
    174 +       replace(t, oldtnode, tn); 
    175   
     175- 
    176176-               /* bits == 1 then node0 and node1 represent inode's children */ 
    177177-               if (inode->bits == 1) { 
     
    208208  
    209209        pr_debug("In halve\n"); 
    210 @@ -577,14 +588,18 @@ static int halve(struct trie *t, struct  
     210@@ -577,14 +588,18 @@ static int halve(struct trie *t, struct 
    211211        if (!tn) 
    212212                return -ENOMEM; 
     
    229229                /* At least one of the children is empty */ 
    230230                if (!node1 || !node0) { 
    231 @@ -609,34 +624,8 @@ static int halve(struct trie *t, struct  
     231@@ -609,34 +624,8 @@ static int halve(struct trie *t, struct 
    232232                put_child(tn, i / 2, inode); 
    233233        } 
  • trunk/target/linux/generic/patches-3.18/080-22-fib_trie-Add-collapse-and-should_collapse-to-resize.patch

    r44695 r44876  
    4141                }; 
    4242                /* This list pointer if valid if bits == 0 (LEAF) */ 
    43 @@ -302,6 +303,16 @@ static struct tnode *tnode_alloc(size_t  
     43@@ -302,6 +303,16 @@ static struct tnode *tnode_alloc(size_t 
    4444                return vzalloc(size); 
    4545 } 
     
    8080  
    8181        pr_debug("AT %p s=%zu %zu\n", tn, sizeof(struct tnode), 
    82 @@ -375,11 +388,11 @@ static void put_child(struct tnode *tn,  
     82@@ -375,11 +388,11 @@ static void put_child(struct tnode *tn, 
    8383  
    8484        BUG_ON(i >= tnode_child_length(tn)); 
     
    9696        /* update fullChildren */ 
    9797        wasfull = tnode_full(tn, chi); 
    98 @@ -630,6 +643,24 @@ static int halve(struct trie *t, struct  
     98@@ -630,6 +643,24 @@ static int halve(struct trie *t, struct 
    9999        return 0; 
    100100 } 
     
    121121 { 
    122122        unsigned char slen = tn->pos; 
    123 @@ -729,10 +760,12 @@ static bool should_inflate(const struct  
     123@@ -729,10 +760,12 @@ static bool should_inflate(const struct 
    124124  
    125125        /* Keep root node larger */ 
  • trunk/target/linux/generic/patches-3.18/080-24-fib_trie-Move-fib_find_alias-to-file-where-it-is-use.patch

    r44695 r44876  
    2424--- a/net/ipv4/fib_semantics.c 
    2525+++ b/net/ipv4/fib_semantics.c 
    26 @@ -414,24 +414,6 @@ errout: 
     26@@ -410,24 +410,6 @@ errout: 
    2727                rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err); 
    2828 } 
  • trunk/target/linux/generic/patches-3.18/080-25-fib_trie-Various-clean-ups-for-handling-slen.patch

    r44695 r44876  
    6565                leaf_push_suffix(l); 
    6666        } 
    67 @@ -1613,6 +1606,7 @@ static int trie_flush_leaf(struct tnode  
     67@@ -1613,6 +1606,7 @@ static int trie_flush_leaf(struct tnode 
    6868        struct hlist_head *lih = &l->list; 
    6969        struct hlist_node *tmp; 
     
    7373        hlist_for_each_entry_safe(li, tmp, lih, hlist) { 
    7474                found += trie_flush_list(&li->falh); 
    75 @@ -1620,8 +1614,14 @@ static int trie_flush_leaf(struct tnode  
     75@@ -1620,8 +1614,14 @@ static int trie_flush_leaf(struct tnode 
    7676                if (list_empty(&li->falh)) { 
    7777                        hlist_del_rcu(&li->hlist); 
  • trunk/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch

    r43093 r44876  
    3737                if (ret < 0) 
    3838                        goto out; 
    39 @@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct 
     39@@ -561,6 +567,17 @@ full_scan: 
    4040                        return err; 
    4141        } 
  • trunk/target/linux/generic/patches-3.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

    r44593 r44876  
    6969--- a/net/ipv4/fib_trie.c 
    7070+++ b/net/ipv4/fib_trie.c 
    71 @@ -2324,6 +2324,7 @@ static const char *const rtn_type_names[ 
     71@@ -2236,6 +2236,7 @@ static const char *const rtn_type_names[ 
    7272        [RTN_THROW] = "THROW", 
    7373        [RTN_NAT] = "NAT", 
  • trunk/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch

    r44318 r44876  
    8585--- a/include/linux/usb/hcd.h 
    8686+++ b/include/linux/usb/hcd.h 
    87 @@ -442,7 +442,14 @@ extern int usb_hcd_pci_probe(struct pci_ 
     87@@ -444,7 +444,14 @@ extern int usb_hcd_pci_probe(struct pci_ 
    8888 extern void usb_hcd_pci_remove(struct pci_dev *dev); 
    8989 extern void usb_hcd_pci_shutdown(struct pci_dev *dev); 
  • trunk/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch

    r43093 r44876  
    7575--- a/include/linux/usb.h 
    7676+++ b/include/linux/usb.h 
    77 @@ -700,6 +700,7 @@ static inline bool usb_device_no_sg_cons 
     77@@ -695,6 +695,7 @@ static inline bool usb_device_no_sg_cons 
    7878        return udev && udev->bus && udev->bus->no_sg_constraint; 
    7979 } 
  • trunk/target/linux/generic/patches-3.18/902-debloat_proc.patch

    r44318 r44876  
    185185--- a/net/ipv4/fib_trie.c 
    186186+++ b/net/ipv4/fib_trie.c 
    187 @@ -2581,10 +2581,12 @@ static const struct file_operations fib_ 
     187@@ -2490,10 +2490,12 @@ static const struct file_operations fib_ 
    188188  
    189189 int __net_init fib_proc_init(struct net *net) 
     
    200200                goto out2; 
    201201  
    202 @@ -2594,17 +2596,21 @@ int __net_init fib_proc_init(struct net 
     202@@ -2503,17 +2505,21 @@ int __net_init fib_proc_init(struct net 
    203203        return 0; 
    204204  
  • trunk/target/linux/generic/patches-3.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch

    r44429 r44876  
    1313 create mode 100644 arch/mips/kernel/machine_kexec.h 
    1414 
    15 diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c 
    16 index 50980bf3..b9c0f75 100644 
    1715--- a/arch/mips/kernel/machine_kexec.c 
    1816+++ b/arch/mips/kernel/machine_kexec.c 
     
    196194        } 
    197195+       pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page); 
    198 + 
     196  
     197-       memcpy((void*)reboot_code_buffer, relocate_new_kernel, 
     198-              relocate_new_kernel_size); 
    199199+       pr_info("Where is memcpy: %p\n", memcpy); 
    200200+       pr_info("kexec_relocate_new_kernel = %p, kexec_relocate_new_kernel_end = %p\n", 
     
    204204+       memcpy((void*)reboot_code_buffer, kexec_relocate_new_kernel, 
    205205+              KEXEC_RELOCATE_NEW_KERNEL_SIZE); 
    206   
    207 -       memcpy((void*)reboot_code_buffer, relocate_new_kernel, 
    208 -              relocate_new_kernel_size); 
     206+ 
    209207+       pr_info("Before _print_args().\n"); 
    210208+       machine_kexec_print_args(); 
     
    233231        atomic_set(&kexec_ready_to_reboot, 1); 
    234232 #endif 
    235 diff --git a/arch/mips/kernel/machine_kexec.h b/arch/mips/kernel/machine_kexec.h 
    236 new file mode 100644 
    237 index 0000000..ae0961e 
    238233--- /dev/null 
    239234+++ b/arch/mips/kernel/machine_kexec.h 
     
    259254+ 
    260255+#endif 
    261 diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S 
    262 index 74bab9d..2c92c50 100644 
    263256--- a/arch/mips/kernel/relocate_kernel.S 
    264257+++ b/arch/mips/kernel/relocate_kernel.S 
     
    292285+       .skip           KEXEC_COMMAND_LINE_SIZE 
    293286+       .size           kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE 
     287+ 
     288+kexec_argv: 
     289+       EXPORT(kexec_argv) 
     290+       .skip           KEXEC_ARGV_SIZE 
     291+       .size           kexec_argv, KEXEC_ARGV_SIZE 
    294292  
    295293-relocate_new_kernel_size: 
     
    297295-       PTR             relocate_new_kernel_end - relocate_new_kernel 
    298296-       .size           relocate_new_kernel_size, PTRSIZE 
    299 +kexec_argv: 
    300 +       EXPORT(kexec_argv) 
    301 +       .skip           KEXEC_ARGV_SIZE 
    302 +       .size           kexec_argv, KEXEC_ARGV_SIZE 
    303 + 
    304297+kexec_relocate_new_kernel_end: 
    305298+       EXPORT(kexec_relocate_new_kernel_end) 
    306 --  
    307 1.7.10.4 
    308  
  • trunk/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch

    r44643 r44876  
    11--- a/fs/yaffs2/yaffs_vfs.c 
    22+++ b/fs/yaffs2/yaffs_vfs.c 
    3 @@ -796,13 +796,13 @@ 
     3@@ -796,13 +796,13 @@ static int yaffs_sync_object(struct file 
    44 static const struct file_operations yaffs_file_operations = { 
    55        .read = do_sync_read, 
     
    1818 }; 
    1919  
    20 @@ -1050,7 +1050,7 @@ 
     20@@ -1050,7 +1050,7 @@ static int yaffs_readlink(struct dentry 
    2121        if (!alias) 
    2222                return -ENOMEM; 
  • trunk/target/linux/generic/patches-3.19/532-jffs2_eofdetect.patch

    r43093 r44876  
    3737                if (ret < 0) 
    3838                        goto out; 
    39 @@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct 
     39@@ -561,6 +567,17 @@ full_scan: 
    4040                        return err; 
    4141        } 
  • trunk/target/linux/generic/patches-3.19/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch

    r44411 r44876  
    1919 1 file changed, 3 insertions(+), 2 deletions(-) 
    2020 
    21 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c 
    22 index 3007d95..728373b 100644 
    2321--- a/drivers/net/ethernet/broadcom/bgmac.c 
    2422+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    25 @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) 
     23@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct 
    2624 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ 
    2725 static int bgmac_probe(struct bcma_device *core) 
     
    3129        struct bgmac *bgmac; 
    3230        struct ssb_sprom *sprom = &core->bus->sprom; 
    33 @@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) 
     31@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic 
    3432        bgmac_chip_reset(bgmac); 
    3533  
     
    4240                int ns_gmac; 
    4341  
    44 --  
    45 1.8.4.5 
    46  
  • trunk/target/linux/generic/patches-3.19/811-pci_disable_usb_common_quirks.patch

    r44126 r44876  
    8585--- a/include/linux/usb/hcd.h 
    8686+++ b/include/linux/usb/hcd.h 
    87 @@ -445,7 +445,14 @@ extern int usb_hcd_pci_probe(struct pci_ 
     87@@ -447,7 +447,14 @@ extern int usb_hcd_pci_probe(struct pci_ 
    8888 extern void usb_hcd_pci_remove(struct pci_dev *dev); 
    8989 extern void usb_hcd_pci_shutdown(struct pci_dev *dev); 
  • trunk/target/linux/generic/patches-3.19/820-usb_add_usb_find_device_by_name.patch

    r44126 r44876  
    7575--- a/include/linux/usb.h 
    7676+++ b/include/linux/usb.h 
    77 @@ -700,6 +700,7 @@ static inline bool usb_device_no_sg_cons 
     77@@ -695,6 +695,7 @@ static inline bool usb_device_no_sg_cons 
    7878        return udev && udev->bus && udev->bus->no_sg_constraint; 
    7979 } 
  • trunk/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch

    r44643 r44876  
    11--- a/fs/yaffs2/yaffs_vfs.c 
    22+++ b/fs/yaffs2/yaffs_vfs.c 
    3 @@ -796,13 +796,13 @@ 
     3@@ -796,13 +796,13 @@ static int yaffs_sync_object(struct file 
    44 static const struct file_operations yaffs_file_operations = { 
    55        .read = do_sync_read, 
     
    1818 }; 
    1919  
    20 @@ -1050,7 +1050,7 @@ 
     20@@ -1050,7 +1050,7 @@ static int yaffs_readlink(struct dentry 
    2121        if (!alias) 
    2222                return -ENOMEM; 
  • trunk/target/linux/generic/patches-4.0/630-packet_socket_type.patch

    r44511 r44876  
    2727--- a/net/packet/af_packet.c 
    2828+++ b/net/packet/af_packet.c 
    29 @@ -1533,6 +1533,7 @@ static int packet_rcv_spkt(struct sk_buf 
     29@@ -1541,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3030 { 
    3131        struct sock *sk; 
     
    3535        /* 
    3636         *      When we registered the protocol we saved the socket in the data 
    37 @@ -1540,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf 
     37@@ -1548,6 +1549,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3838         */ 
    3939  
     
    4343        /* 
    4444         *      Yank back the headers [hope the device set this 
    45 @@ -1552,7 +1554,7 @@ static int packet_rcv_spkt(struct sk_buf 
     45@@ -1560,7 +1562,7 @@ static int packet_rcv_spkt(struct sk_buf 
    4646         *      so that this procedure is noop. 
    4747         */ 
     
    5252  
    5353        if (!net_eq(dev_net(dev), sock_net(sk))) 
    54 @@ -1759,12 +1761,12 @@ static int packet_rcv(struct sk_buff *sk 
     54@@ -1767,12 +1769,12 @@ static int packet_rcv(struct sk_buff *sk 
    5555        int skb_len = skb->len; 
    5656        unsigned int snaplen, res; 
     
    6868                goto drop; 
    6969  
    70 @@ -1884,12 +1886,12 @@ static int tpacket_rcv(struct sk_buff *s 
     70@@ -1892,12 +1894,12 @@ static int tpacket_rcv(struct sk_buff *s 
    7171        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); 
    7272        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); 
     
    8484                goto drop; 
    8585  
    86 @@ -2845,6 +2847,7 @@ static int packet_create(struct net *net 
     86@@ -2853,6 +2855,7 @@ static int packet_create(struct net *net 
    8787        spin_lock_init(&po->bind_lock); 
    8888        mutex_init(&po->pg_vec_lock); 
     
    9292        if (sock->type == SOCK_PACKET) 
    9393                po->prot_hook.func = packet_rcv_spkt; 
    94 @@ -3428,6 +3431,16 @@ packet_setsockopt(struct socket *sock, i 
     94@@ -3442,6 +3445,16 @@ packet_setsockopt(struct socket *sock, i 
    9595                po->xmit = val ? packet_direct_xmit : dev_queue_xmit; 
    9696                return 0; 
     
    109109                return -ENOPROTOOPT; 
    110110        } 
    111 @@ -3479,6 +3492,13 @@ static int packet_getsockopt(struct sock 
     111@@ -3493,6 +3506,13 @@ static int packet_getsockopt(struct sock 
    112112        case PACKET_VNET_HDR: 
    113113                val = po->has_vnet_hdr; 
  • trunk/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch

    r44511 r44876  
    5353 int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, 
    5454                      u32 banned_flags) 
    55 @@ -5524,6 +5523,9 @@ int __init addrconf_init(void) 
     55@@ -5539,6 +5538,9 @@ int __init addrconf_init(void) 
    5656  
    5757        ipv6_addr_label_rtnl_register(); 
     
    6363 errout: 
    6464        rtnl_af_unregister(&inet6_ops); 
    65 @@ -5543,6 +5545,9 @@ void addrconf_cleanup(void) 
     65@@ -5558,6 +5560,9 @@ void addrconf_cleanup(void) 
    6666        struct net_device *dev; 
    6767        int i; 
  • trunk/target/linux/generic/patches-4.0/700-swconfig.patch

    r44511 r44876  
    3030--- a/include/uapi/linux/Kbuild 
    3131+++ b/include/uapi/linux/Kbuild 
    32 @@ -380,6 +380,7 @@ header-y += stddef.h 
     32@@ -379,6 +379,7 @@ header-y += stddef.h 
    3333 header-y += string.h 
    3434 header-y += suspend_ioctls.h 
  • trunk/target/linux/generic/patches-4.0/701-phy_extension.patch

    r44511 r44876  
    11--- a/drivers/net/phy/phy.c 
    22+++ b/drivers/net/phy/phy.c 
    3 @@ -338,6 +338,50 @@ int phy_ethtool_gset(struct phy_device * 
     3@@ -357,6 +357,50 @@ int phy_ethtool_gset(struct phy_device * 
    44 } 
    55 EXPORT_SYMBOL(phy_ethtool_gset); 
  • trunk/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch

    r44511 r44876  
    1313  
    1414 static const struct bcma_device_id bgmac_bcma_tbl[] = { 
    15 @@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct 
     15@@ -1398,6 +1399,17 @@ static void bgmac_mii_unregister(struct 
    1616        mdiobus_free(mii_bus); 
    1717 } 
     
    3131  * BCMA bus ops 
    3232  **************************************************/ 
    33 @@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic 
     33@@ -1517,6 +1529,16 @@ static int bgmac_probe(struct bcma_devic 
    3434                goto err_dma_free; 
    3535        } 
     
    4848        if (err) { 
    4949                bgmac_err(bgmac, "Cannot register net device\n"); 
    50 @@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev 
     50@@ -1543,6 +1565,10 @@ static void bgmac_remove(struct bcma_dev 
    5151 { 
    5252        struct bgmac *bgmac = bcma_get_drvdata(core); 
  • trunk/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch

    r44511 r44876  
    1010--- a/drivers/net/ethernet/broadcom/bgmac.c 
    1111+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    12 @@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma 
     12@@ -360,6 +360,27 @@ static int bgmac_dma_rx_read(struct bgma 
    1313                        dma_addr_t old_dma_addr = slot->dma_addr; 
    1414                        int err; 
  • trunk/target/linux/generic/patches-4.0/863-gpiommc.patch

    r44511 r44876  
    831831--- a/MAINTAINERS 
    832832+++ b/MAINTAINERS 
    833 @@ -4463,6 +4463,11 @@ T:       git git://linuxtv.org/anttip/media_tr 
     833@@ -4474,6 +4474,11 @@ T:       git git://linuxtv.org/anttip/media_tr 
    834834 S:     Maintained 
    835835 F:     drivers/media/usb/hackrf/ 
  • trunk/target/linux/generic/patches-4.0/902-debloat_proc.patch

    r44511 r44876  
    11--- a/fs/locks.c 
    22+++ b/fs/locks.c 
    3 @@ -2640,6 +2640,8 @@ static const struct file_operations proc 
     3@@ -2641,6 +2641,8 @@ static const struct file_operations proc 
    44  
    55 static int __init proc_locks_init(void) 
     
    123123--- a/mm/vmalloc.c 
    124124+++ b/mm/vmalloc.c 
    125 @@ -2661,6 +2661,8 @@ static const struct file_operations proc 
     125@@ -2662,6 +2662,8 @@ static const struct file_operations proc 
    126126  
    127127 static int __init proc_vmalloc_init(void) 
  • trunk/target/linux/generic/patches-4.0/930-crashlog.patch

    r44511 r44876  
    246246--- a/kernel/module.c 
    247247+++ b/kernel/module.c 
    248 @@ -105,6 +105,9 @@ static LIST_HEAD(modules); 
     248@@ -104,6 +104,9 @@ static LIST_HEAD(modules); 
    249249 #ifdef CONFIG_KGDB_KDB 
    250250 struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ 
Note: See TracChangeset for help on using the changeset viewer.