ia64/xen-unstable

changeset 12897:57b36b893a8d

[NET] back: Atomic buffer allocations use __GFP_NOWARN.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Mon Dec 11 09:56:02 2006 +0000 (2006-12-11)
parents f5121d001d1a
children 6edf8b33e7d1
files linux-2.6-xen-sparse/drivers/xen/netback/netback.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Sat Dec 09 16:29:52 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Mon Dec 11 09:56:02 2006 +0000
     1.3 @@ -183,7 +183,7 @@ static struct sk_buff *netbk_copy_skb(st
     1.4  
     1.5  	BUG_ON(skb_shinfo(skb)->frag_list != NULL);
     1.6  
     1.7 -	nskb = alloc_skb(SKB_MAX_HEAD(0), GFP_ATOMIC);
     1.8 +	nskb = alloc_skb(SKB_MAX_HEAD(0), GFP_ATOMIC | __GFP_NOWARN);
     1.9  	if (unlikely(!nskb))
    1.10  		goto err;
    1.11  
    1.12 @@ -1224,7 +1224,8 @@ static void net_tx_action(unsigned long 
    1.13  			    ret < MAX_SKB_FRAGS) ?
    1.14  			PKT_PROT_LEN : txreq.size;
    1.15  
    1.16 -		skb = alloc_skb(data_len + 16 + NET_IP_ALIGN, GFP_ATOMIC);
    1.17 +		skb = alloc_skb(data_len + 16 + NET_IP_ALIGN,
    1.18 +				GFP_ATOMIC | __GFP_NOWARN);
    1.19  		if (unlikely(skb == NULL)) {
    1.20  			DPRINTK("Can't allocate a skb in start_xmit.\n");
    1.21  			netbk_tx_err(netif, &txreq, i);