diff options
| author | Greg Kroah-Hartman | 2011-04-13 21:14:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-13 21:14:05 +0200 |
| commit | 32235b07b52e948900613e27c5cbd955d084ae8a (patch) | |
| tree | 92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/hv/vmbus_drv.c | |
| parent | staging: IIO: DAC: New driver for the AD5504 and AD55041 High Voltage DACs (diff) | |
| parent | Linux 2.6.39-rc3 (diff) | |
| download | kernel-qcow2-linux-32235b07b52e948900613e27c5cbd955d084ae8a.tar.gz kernel-qcow2-linux-32235b07b52e948900613e27c5cbd955d084ae8a.tar.xz kernel-qcow2-linux-32235b07b52e948900613e27c5cbd955d084ae8a.zip | |
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 501ab369abbd..c944450c6f09 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -527,7 +527,7 @@ static int vmbus_on_isr(void) 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])) ret |= 0x2; return ret; |