moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 51e6d17809 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline

Browse Source 
First steps of the 5.12-rc1 merge, the large networking chunk.

Resolves merge conflicts in:
	net/core/filter.c
	net/ipv6/route.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id1650a4e7ab7104647e85beddddb672f779d4d1f
This commit is contained in:
Greg Kroah-Hartman
2021-02-23 08:01:48 +01:00
parent 42daaf8760 51e6d17809
commit 4d1e11edcc
1581 changed files with 110766 additions and 33362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/gfp.h
View File

@@ -574,8 +574,16 @@ extern void free_pages(unsigned long addr, unsigned int order);
struct page_frag_cache;
extern void __page_frag_cache_drain(struct page *page, unsigned int count);
extern void *page_frag_alloc(struct page_frag_cache *nc,
unsigned int fragsz, gfp_t gfp_mask);
extern void *page_frag_alloc_align(struct page_frag_cache *nc,
unsigned int fragsz, gfp_t gfp_mask,
unsigned int align_mask);
static inline void *page_frag_alloc(struct page_frag_cache *nc,
unsigned int fragsz, gfp_t gfp_mask)
{
return page_frag_alloc_align(nc, fragsz, gfp_mask, ~0u);
}
extern void page_frag_free(void *addr);
#define __free_page(page) __free_pages((page), 0)