Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 8bddff150c70..ef671d1a3bf0 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -946,8 +946,7 @@ err:
                 work_done++;
         }
 
-        while ((skb = __skb_dequeue(&errq)))
-                kfree_skb(skb);
+        __skb_queue_purge(&errq);
 
         work_done -= handle_incoming_queue(dev, &rxq);
 
@@ -1079,8 +1078,7 @@ static void xennet_release_rx_bufs(struct netfront_info *np)
                 }
         }
 
-        while ((skb = __skb_dequeue(&free_list)) != NULL)
-                dev_kfree_skb(skb);
+        __skb_queue_purge(&free_list);
 
         spin_unlock_bh(&np->rx_lock);
 }
@@ -1326,7 +1324,7 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
                 goto fail;
         }
 
-        txs = (struct xen_netif_tx_sring *)get_zeroed_page(GFP_KERNEL);
+        txs = (struct xen_netif_tx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
         if (!txs) {
                 err = -ENOMEM;
                 xenbus_dev_fatal(dev, err, "allocating tx ring page");
@@ -1342,7 +1340,7 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
         }
 
         info->tx_ring_ref = err;
-        rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_KERNEL);
+        rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
         if (!rxs) {
                 err = -ENOMEM;
                 xenbus_dev_fatal(dev, err, "allocating rx ring page");