From ef01a69d7cc7f4a8b2d4e91deefaabe6e16f0102 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 29 Apr 2011 13:45:06 -0700 Subject: [PATCH] --- yaml --- r: 249353 b: refs/heads/master c: 59c0e4f0a665396bb5301f82764ebda8e3153783 h: refs/heads/master i: 249351: 9c2388387cb87829f2534434e6b23cee96cb8623 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fa6f8070f4de..60e798163be1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef58f5d13537da06a131c1a2505a81fdd7d4a059 +refs/heads/master: 59c0e4f0a665396bb5301f82764ebda8e3153783 diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index 4106dd321faf..38bfff044dfb 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/drivers/staging/hv/vmbus_drv.c @@ -42,10 +42,11 @@ static struct pci_dev *hv_pci_dev; +static struct tasklet_struct msg_dpc; + /* Main vmbus driver data structure */ struct hv_bus { struct bus_type bus; - struct tasklet_struct msg_dpc; struct tasklet_struct event_dpc; }; @@ -515,7 +516,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id) /* Schedules a dpc if necessary */ if (ret > 0) { if (test_bit(0, (unsigned long *)&ret)) - tasklet_schedule(&hv_bus.msg_dpc); + tasklet_schedule(&msg_dpc); if (test_bit(1, (unsigned long *)&ret)) tasklet_schedule(&hv_bus.event_dpc); @@ -550,7 +551,7 @@ static int vmbus_bus_init(struct pci_dev *pdev) hv_bus.bus.name = driver_name; /* Initialize the bus context */ - tasklet_init(&hv_bus.msg_dpc, vmbus_on_msg_dpc, 0); + tasklet_init(&msg_dpc, vmbus_on_msg_dpc, 0); tasklet_init(&hv_bus.event_dpc, vmbus_on_event, 0); /* Now, register the bus with LDM */