diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
| commit | 17afb853eec6dc4f39f0815831379be004f98cc5 (patch) | |
| tree | 5feb5a032288f0a36cc3890d258bcfb95b2f1ad3 /target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch | |
| parent | 87568ebeacd733d211da5dcce8d82df4aa872b84 (diff) | |
| download | upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.gz upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.bz2 upstream-17afb853eec6dc4f39f0815831379be004f98cc5.zip | |
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@makrotopia.org>
SVN-Revision: 44876
Diffstat (limited to 'target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch b/target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch index 16ad37d5e2..51178a0f14 100644 --- a/target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch +++ b/target/linux/generic/patches-3.18/080-15-fib_trie-Push-tnode-flushing-down-to-inflate-halve.patch @@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static size_t tnode_free_size; /* -@@ -307,32 +305,6 @@ static struct tnode *tnode_alloc(size_t +@@ -307,32 +305,6 @@ static struct tnode *tnode_alloc(size_t return vzalloc(size); } @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static struct tnode *leaf_new(t_key key) { struct tnode *l = kmem_cache_alloc(trie_leaf_kmem, GFP_KERNEL); -@@ -433,17 +405,33 @@ static void put_child_root(struct tnode +@@ -433,17 +405,33 @@ static void put_child_root(struct tnode rcu_assign_pointer(t->trie, n); } @@ -169,7 +169,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return -ENOMEM; } -@@ -599,17 +593,20 @@ static int halve(struct trie *t, struct +@@ -599,17 +593,20 @@ static int halve(struct trie *t, struct struct tnode *newn; newn = tnode_new(left->key, oldtnode->pos, 1); @@ -192,7 +192,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> for (i = 0; i < olen; i += 2) { struct tnode *newBinNode; -@@ -636,11 +633,14 @@ static int halve(struct trie *t, struct +@@ -636,11 +633,14 @@ static int halve(struct trie *t, struct put_child(tn, i / 2, newBinNode); |