kernel: Update kernel 4.9 to version 4.9.240

[openwrt/staging/hauke.git] / target / linux / generic / backport-4.9 / 041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch

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 e646efd6406440b50e67ec43e1301e1d76684554..d27bf9405798e8dbae6855880f7fe14dcc52d668 100644 (file)
--- 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
@@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  #define free_page(addr) free_pages((addr), 0)
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2477,7 +2477,7 @@ static inline struct sk_buff *netdev_all
+@@ -2489,7 +2489,7 @@ static inline struct sk_buff *netdev_all
  
  static inline void skb_free_frag(void *addr)
  {
@@ -63,7 +63,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  void *napi_alloc_frag(unsigned int fragsz);
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -3955,8 +3955,8 @@ void __page_frag_drain(struct page *page
+@@ -3956,8 +3956,8 @@ void __page_frag_drain(struct page *page
  }
  EXPORT_SYMBOL(__page_frag_drain);
  
@@ -74,7 +74,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  {
        unsigned int size = PAGE_SIZE;
        struct page *page;
-@@ -4007,19 +4007,19 @@ refill:
+@@ -4008,19 +4008,19 @@ refill:
  
        return nc->va + offset;
  }