Commit 28b6ca9c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: hv: osd: remove MemoryFence wrapper

Use the "real" mb call instead of a wrapper function.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4362c9c
...@@ -411,7 +411,7 @@ RingBufferWrite( ...@@ -411,7 +411,7 @@ RingBufferWrite(
sizeof(u64)); sizeof(u64));
// Make sure we flush all writes before updating the writeIndex // Make sure we flush all writes before updating the writeIndex
MemoryFence(); mb();
// Now, update the write location // Now, update the write location
SetNextWriteLocation(OutRingInfo, nextWriteLocation); SetNextWriteLocation(OutRingInfo, nextWriteLocation);
...@@ -532,7 +532,7 @@ RingBufferRead( ...@@ -532,7 +532,7 @@ RingBufferRead(
// Make sure all reads are done before we update the read index since // Make sure all reads are done before we update the read index since
// the writer may start writing to the read area once the read index is updated // the writer may start writing to the read area once the read index is updated
MemoryFence(); mb();
// Update the read index // Update the read index
SetNextReadLocation(InRingInfo, nextReadLocation); SetNextReadLocation(InRingInfo, nextReadLocation);
......
...@@ -426,7 +426,7 @@ VmbusOnMsgDPC( ...@@ -426,7 +426,7 @@ VmbusOnMsgDPC(
// Make sure the write to MessageType (ie set to HvMessageTypeNone) happens // Make sure the write to MessageType (ie set to HvMessageTypeNone) happens
// before we read the MessagePending and EOMing. Otherwise, the EOMing will not deliver // before we read the MessagePending and EOMing. Otherwise, the EOMing will not deliver
// any more messages since there is no empty slot // any more messages since there is no empty slot
MemoryFence(); mb();
if (msg->Header.MessageFlags.MessagePending) if (msg->Header.MessageFlags.MessagePending)
{ {
......
...@@ -119,8 +119,6 @@ extern void PageFree(void* page, unsigned int count); ...@@ -119,8 +119,6 @@ extern void PageFree(void* page, unsigned int count);
extern void* MemMapIO(unsigned long phys, unsigned long size); extern void* MemMapIO(unsigned long phys, unsigned long size);
extern void MemUnmapIO(void* virt); extern void MemUnmapIO(void* virt);
extern void MemoryFence(void);
extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context); extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context);
extern void TimerClose(HANDLE hTimer); extern void TimerClose(HANDLE hTimer);
extern int TimerStop(HANDLE hTimer); extern int TimerStop(HANDLE hTimer);
......
...@@ -197,11 +197,6 @@ void MemUnmapIO(void *virt) ...@@ -197,11 +197,6 @@ void MemUnmapIO(void *virt)
//iounmap(virt); //iounmap(virt);
} }
void MemoryFence()
{
mb();
}
void TimerCallback(unsigned long data) void TimerCallback(unsigned long data)
{ {
TIMER* t = (TIMER*)data; TIMER* t = (TIMER*)data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment