diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-25 11:24:12 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-25 17:34:25 +0100 |
| commit | e2ba7a4b4707b8e24b1b28abbc17313b98362fa2 (patch) | |
| tree | be62b3254efabe377d0148be1ae4d85840dac6b0 /target/linux/generic | |
| parent | 1be6ff6dc0ab53d2191c49c32cae7f6f9aadd14d (diff) | |
| download | upstream-e2ba7a4b4707b8e24b1b28abbc17313b98362fa2.tar.gz upstream-e2ba7a4b4707b8e24b1b28abbc17313b98362fa2.tar.bz2 upstream-e2ba7a4b4707b8e24b1b28abbc17313b98362fa2.zip | |
kernel: bump 4.9 to 4.9.160
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch | 6 | ||||
| -rw-r--r-- | target/linux/generic/hack-4.9/721-phy_packets.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch b/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch index d1da94b4e6..facc43004e 100644 --- a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch +++ b/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch @@ -108,7 +108,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> local_irq_restore(flags); return data; } -@@ -391,7 +391,7 @@ static void *__napi_alloc_frag(unsigned +@@ -393,7 +393,7 @@ static void *__napi_alloc_frag(unsigned { struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache); @@ -117,7 +117,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> } void *napi_alloc_frag(unsigned int fragsz) -@@ -441,7 +441,7 @@ struct sk_buff *__netdev_alloc_skb(struc +@@ -445,7 +445,7 @@ struct sk_buff *__netdev_alloc_skb(struc local_irq_save(flags); nc = this_cpu_ptr(&netdev_alloc_cache); @@ -126,7 +126,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> pfmemalloc = nc->pfmemalloc; local_irq_restore(flags); -@@ -505,7 +505,7 @@ struct sk_buff *__napi_alloc_skb(struct +@@ -509,7 +509,7 @@ struct sk_buff *__napi_alloc_skb(struct if (sk_memalloc_socks()) gfp_mask |= __GFP_MEMALLOC; diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch index 9bc5b01776..d22c873032 100644 --- a/target/linux/generic/hack-4.9/721-phy_packets.patch +++ b/target/linux/generic/hack-4.9/721-phy_packets.patch @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/protocol.h> #include <net/dst.h> -@@ -529,6 +530,22 @@ skb_fail: +@@ -533,6 +534,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); |