aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-18 18:21:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-18 18:21:08 +0000
commit17afb853eec6dc4f39f0815831379be004f98cc5 (patch)
tree5feb5a032288f0a36cc3890d258bcfb95b2f1ad3 /target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch
parent87568ebeacd733d211da5dcce8d82df4aa872b84 (diff)
downloadupstream-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-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch')
-rw-r--r--target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch b/target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch
index 8384009658..2e6deb5bbc 100644
--- a/target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch
+++ b/target/linux/generic/patches-3.18/080-02-fib_trie-Update-usage-stats-to-be-percpu-instead-of-.patch
@@ -189,7 +189,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
#endif /* CONFIG_IP_FIB_TRIE_STATS */
-@@ -2191,7 +2219,7 @@ static int fib_triestat_seq_show(struct
+@@ -2191,7 +2219,7 @@ static int fib_triestat_seq_show(struct
trie_collect_stats(t, &stat);
trie_show_stats(seq, &stat);
#ifdef CONFIG_IP_FIB_TRIE_STATS