diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
| commit | 775d71e49c65f1f6aa57776ea1da62988fc9a30a (patch) | |
| tree | ce03cae544bacc8dda67422fd66a543dd1ae3c99 /drivers/staging/hv/vmbus_drv.c | |
| parent | 18e82d2b952ab57fc1c8a69d4fa14e562f2aecf6 (diff) | |
| parent | c1a952f48517b5545075d8eb1a5d543099bd2ae1 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38KNOWN_GOOD
Diffstat (limited to 'drivers/staging/hv/vmbus_drv.c')
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 84fdb64d3ce..87e6cf2086f 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -291,7 +291,7 @@ static int vmbus_on_isr(struct hv_driver *drv) event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT; /* Since we are a child, we only need to check bit 0 */ - if (test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) { + if (sync_test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) { DPRINT_DBG(VMBUS, "received event %d", event->flags32[0]); ret |= 0x2; } |