OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 31... Line 31...
31 extern void *page_frag_alloc(struct page_frag_cache *nc, 31 extern void *page_frag_alloc(struct page_frag_cache *nc,
32 unsigned int fragsz, gfp_t gfp_mask); 32 unsigned int fragsz, gfp_t gfp_mask);
33 extern void page_frag_free(void *addr); 33 extern void page_frag_free(void *addr);
34 --- a/mm/page_alloc.c 34 --- a/mm/page_alloc.c
35 +++ b/mm/page_alloc.c 35 +++ b/mm/page_alloc.c
36 @@ -3914,8 +3914,8 @@ EXPORT_SYMBOL(free_pages); 36 @@ -3924,8 +3924,8 @@ EXPORT_SYMBOL(free_pages);
37 * drivers to provide a backing region of memory for use as either an 37 * drivers to provide a backing region of memory for use as either an
38 * sk_buff->head, or to be used in the "frags" portion of skb_shared_info. 38 * sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
39 */ 39 */
40 -static struct page *__page_frag_refill(struct page_frag_cache *nc, 40 -static struct page *__page_frag_refill(struct page_frag_cache *nc,
41 - gfp_t gfp_mask) 41 - gfp_t gfp_mask)
42 +static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, 42 +static struct page *__page_frag_cache_refill(struct page_frag_cache *nc,
43 + gfp_t gfp_mask) 43 + gfp_t gfp_mask)
44 { 44 {
45 struct page *page = NULL; 45 struct page *page = NULL;
46 gfp_t gfp = gfp_mask; 46 gfp_t gfp = gfp_mask;
47 @@ -3935,19 +3935,20 @@ static struct page *__page_frag_refill(s 47 @@ -3945,19 +3945,20 @@ static struct page *__page_frag_refill(s
48 return page; 48 return page;
49 } 49 }
Line 50... Line 50...
50 50
51 -void __page_frag_drain(struct page *page, unsigned int order, 51 -void __page_frag_drain(struct page *page, unsigned int order,
Line 66... Line 66...
66 -EXPORT_SYMBOL(__page_frag_drain); 66 -EXPORT_SYMBOL(__page_frag_drain);
67 +EXPORT_SYMBOL(__page_frag_cache_drain); 67 +EXPORT_SYMBOL(__page_frag_cache_drain);
Line 68... Line 68...
68 68
69 void *page_frag_alloc(struct page_frag_cache *nc, 69 void *page_frag_alloc(struct page_frag_cache *nc,
70 unsigned int fragsz, gfp_t gfp_mask) 70 unsigned int fragsz, gfp_t gfp_mask)
Line 71... Line 71...
71 @@ -3958,7 +3959,7 @@ void *page_frag_alloc(struct page_frag_c 71 @@ -3968,7 +3969,7 @@ void *page_frag_alloc(struct page_frag_c
72 72
73 if (unlikely(!nc->va)) { 73 if (unlikely(!nc->va)) {
74 refill: 74 refill: