diff --git a/[refs] b/[refs] index b65c1c32dc2f..aea9f6d7f50f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbea270714faae389c48c2901ee7988ecd62f664 +refs/heads/master: 719bfeaae8104fca4ca5d47c02592b08682f14fa diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index 74776de523ec..f546e81acc45 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -1758,8 +1758,9 @@ static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len) static inline char *alloc_one_pg_vec_page(unsigned long order) { - return (char *) __get_free_pages(GFP_KERNEL | __GFP_COMP | __GFP_ZERO, - order); + gfp_t gfp_flags = GFP_KERNEL | __GFP_COMP | __GFP_ZERO | __GFP_NOWARN; + + return (char *) __get_free_pages(gfp_flags, order); } static char **alloc_pg_vec(struct tpacket_req *req, int order)