OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 50... | Line 50... | |||
50 | |
50 | |
|
51 | #define __free_page(page) __free_pages((page), 0) |
51 | #define __free_page(page) __free_pages((page), 0) |
|
52 | #define free_page(addr) free_pages((addr), 0) |
52 | #define free_page(addr) free_pages((addr), 0) |
|
53 | --- a/include/linux/skbuff.h |
53 | --- a/include/linux/skbuff.h |
|
54 | +++ b/include/linux/skbuff.h |
54 | +++ b/include/linux/skbuff.h |
|
Line 55... | Line 55... | |||
55 | @@ -2476,7 +2476,7 @@ static inline struct sk_buff *netdev_all |
55 | @@ -2471,7 +2471,7 @@ static inline struct sk_buff *netdev_all |
|
56 | |
56 | |
|
57 | static inline void skb_free_frag(void *addr) |
57 | static inline void skb_free_frag(void *addr) |
|
58 | { |
58 | { |
|
59 | - __free_page_frag(addr); |
59 | - __free_page_frag(addr); |
|
Line 60... | Line 60... | |||
60 | + page_frag_free(addr); |
60 | + page_frag_free(addr); |
|
61 | } |
61 | } |
|
62 | |
62 | |
|
63 | void *napi_alloc_frag(unsigned int fragsz); |
63 | void *napi_alloc_frag(unsigned int fragsz); |
|
64 | --- a/mm/page_alloc.c |
64 | --- a/mm/page_alloc.c |
|
65 | +++ b/mm/page_alloc.c |
65 | +++ b/mm/page_alloc.c |
|
Line 66... | Line 66... | |||
66 | @@ -3949,8 +3949,8 @@ void __page_frag_drain(struct page *page |
66 | @@ -3959,8 +3959,8 @@ void __page_frag_drain(struct page *page |
|
67 | } |
67 | } |
|
68 | EXPORT_SYMBOL(__page_frag_drain); |
68 | EXPORT_SYMBOL(__page_frag_drain); |
|
69 | |
69 | |
|
70 | -void *__alloc_page_frag(struct page_frag_cache *nc, |
70 | -void *__alloc_page_frag(struct page_frag_cache *nc, |
|
71 | - unsigned int fragsz, gfp_t gfp_mask) |
71 | - unsigned int fragsz, gfp_t gfp_mask) |
|
72 | +void *page_frag_alloc(struct page_frag_cache *nc, |
72 | +void *page_frag_alloc(struct page_frag_cache *nc, |
|
73 | + unsigned int fragsz, gfp_t gfp_mask) |
73 | + unsigned int fragsz, gfp_t gfp_mask) |
|
Line 74... | Line 74... | |||
74 | { |
74 | { |
|
75 | unsigned int size = PAGE_SIZE; |
75 | unsigned int size = PAGE_SIZE; |
|
76 | struct page *page; |
76 | struct page *page; |
|
77 | @@ -4001,19 +4001,19 @@ refill: |
77 | @@ -4011,19 +4011,19 @@ refill: |
|
Line 106... | Line 106... | |||
106 | - data = __alloc_page_frag(nc, fragsz, gfp_mask); |
106 | - data = __alloc_page_frag(nc, fragsz, gfp_mask); |
|
107 | + data = page_frag_alloc(nc, fragsz, gfp_mask); |
107 | + data = page_frag_alloc(nc, fragsz, gfp_mask); |
|
108 | local_irq_restore(flags); |
108 | local_irq_restore(flags); |
|
109 | return data; |
109 | return data; |
|
110 | } |
110 | } |
|
111 | @@ -393,7 +393,7 @@ static void *__napi_alloc_frag(unsigned |
111 | @@ -391,7 +391,7 @@ static void *__napi_alloc_frag(unsigned |
|
112 | { |
112 | { |
|
113 | struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache); |
113 | struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache); |
|
Line 114... | Line 114... | |||
114 | |
114 | |
|
115 | - return __alloc_page_frag(&nc->page, fragsz, gfp_mask); |
115 | - return __alloc_page_frag(&nc->page, fragsz, gfp_mask); |
|
116 | + return page_frag_alloc(&nc->page, fragsz, gfp_mask); |
116 | + return page_frag_alloc(&nc->page, fragsz, gfp_mask); |
|
Line 117... | Line 117... | |||
117 | } |
117 | } |
|
118 | |
118 | |
|
119 | void *napi_alloc_frag(unsigned int fragsz) |
119 | void *napi_alloc_frag(unsigned int fragsz) |
|
Line 120... | Line 120... | |||
120 | @@ -445,7 +445,7 @@ struct sk_buff *__netdev_alloc_skb(struc |
120 | @@ -441,7 +441,7 @@ struct sk_buff *__netdev_alloc_skb(struc |
|
121 | local_irq_save(flags); |
121 | local_irq_save(flags); |
|
122 | |
122 | |
|
123 | nc = this_cpu_ptr(&netdev_alloc_cache); |
123 | nc = this_cpu_ptr(&netdev_alloc_cache); |
|
Line 124... | Line 124... | |||
124 | - data = __alloc_page_frag(nc, len, gfp_mask); |
124 | - data = __alloc_page_frag(nc, len, gfp_mask); |
|
125 | + data = page_frag_alloc(nc, len, gfp_mask); |
125 | + data = page_frag_alloc(nc, len, gfp_mask); |
|
126 | pfmemalloc = nc->pfmemalloc; |
126 | pfmemalloc = nc->pfmemalloc; |
|
127 | |
127 | |
|
Line 128... | Line 128... | |||
128 | local_irq_restore(flags); |
128 | local_irq_restore(flags); |
|
129 | @@ -509,7 +509,7 @@ struct sk_buff *__napi_alloc_skb(struct |
129 | @@ -505,7 +505,7 @@ struct sk_buff *__napi_alloc_skb(struct |