diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
commit | 32235b07b52e948900613e27c5cbd955d084ae8a (patch) | |
tree | 92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/hv/channel.c | |
parent | 59c23eabdae97a18cfc400339138f6d1dbde926a (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
download | op-kernel-dev-32235b07b52e948900613e27c5cbd955d084ae8a.zip op-kernel-dev-32235b07b52e948900613e27c5cbd955d084ae8a.tar.gz |
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/channel.c')
-rw-r--r-- | drivers/staging/hv/channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index 580ce69..b53be58 100644 --- a/drivers/staging/hv/channel.c +++ b/drivers/staging/hv/channel.c @@ -83,14 +83,14 @@ static void vmbus_setevent(struct vmbus_channel *channel) if (channel->offermsg.monitor_allocated) { /* Each u32 represents 32 channels */ - set_bit(channel->offermsg.child_relid & 31, + sync_set_bit(channel->offermsg.child_relid & 31, (unsigned long *) vmbus_connection.send_int_page + (channel->offermsg.child_relid >> 5)); monitorpage = vmbus_connection.monitor_pages; monitorpage++; /* Get the child to parent monitor page */ - set_bit(channel->monitor_bit, + sync_set_bit(channel->monitor_bit, (unsigned long *)&monitorpage->trigger_group [channel->monitor_grp].pending); @@ -106,7 +106,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) if (Channel->offermsg.monitor_allocated) { /* Each u32 represents 32 channels */ - clear_bit(Channel->offermsg.child_relid & 31, + sync_clear_bit(Channel->offermsg.child_relid & 31, (unsigned long *)vmbus_connection.send_int_page + (Channel->offermsg.child_relid >> 5)); @@ -114,7 +114,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) vmbus_connection.monitor_pages; monitorPage++; /* Get the child to parent monitor page */ - clear_bit(Channel->monitor_bit, + sync_clear_bit(Channel->monitor_bit, (unsigned long *)&monitorPage->trigger_group [Channel->monitor_grp].Pending); } |