1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 9259a732e8a4..12f9e2708afb 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -483,9 +483,8 @@ int xenvif_init_queue(struct xenvif_queue *queue)
          * better enable it. The long term solution would be to use just a
          * bunch of valid page descriptors, without dependency on ballooning
          */
-        err = alloc_xenballooned_pages(MAX_PENDING_REQS,
-                                       queue->mmap_pages,
-                                       false);
+        err = gnttab_alloc_pages(MAX_PENDING_REQS,
+                                 queue->mmap_pages);
         if (err) {
                 netdev_err(queue->vif->dev, "Could not reserve mmap_pages\n");
                 return -ENOMEM;
@@ -578,6 +577,7 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref,
                 goto err_rx_unbind;
         }
         queue->task = task;
+        get_task_struct(task);
 
         task = kthread_create(xenvif_dealloc_kthread,
                               (void *)queue, "%s-dealloc", queue->name);
@@ -634,6 +634,7 @@ void xenvif_disconnect(struct xenvif *vif)
 
                 if (queue->task) {
                         kthread_stop(queue->task);
+                        put_task_struct(queue->task);
                         queue->task = NULL;
                 }
 
@@ -662,7 +663,7 @@ void xenvif_disconnect(struct xenvif *vif)
  */
 void xenvif_deinit_queue(struct xenvif_queue *queue)
 {
-        free_xenballooned_pages(MAX_PENDING_REQS, queue->mmap_pages);
+        gnttab_free_pages(MAX_PENDING_REQS, queue->mmap_pages);
 }
 
 void xenvif_free(struct xenvif *vif)