Merge branch 'next' into for-linus

Second round of updates for 3.20.

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 9259a732e8a4..037f74f0fcf6 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -578,6 +578,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 +635,7 @@ void xenvif_disconnect(struct xenvif *vif)
 
                 if (queue->task) {
                         kthread_stop(queue->task);
+                        put_task_struct(queue->task);
                         queue->task = NULL;
                 }