From 28b6ca9c07787885b89972929f45084eb3197d98 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Jul 2009 12:34:20 -0700 Subject: [PATCH] Staging: hv: osd: remove MemoryFence wrapper Use the "real" mb call instead of a wrapper function. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/RingBuffer.c | 4 ++-- drivers/staging/hv/Vmbus.c | 2 +- drivers/staging/hv/include/osd.h | 2 -- drivers/staging/hv/osd.c | 5 ----- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c index 21fc4cc6326d..e99546835f28 100644 --- a/drivers/staging/hv/RingBuffer.c +++ b/drivers/staging/hv/RingBuffer.c @@ -411,7 +411,7 @@ RingBufferWrite( sizeof(u64)); // Make sure we flush all writes before updating the writeIndex - MemoryFence(); + mb(); // Now, update the write location SetNextWriteLocation(OutRingInfo, nextWriteLocation); @@ -532,7 +532,7 @@ RingBufferRead( // 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 - MemoryFence(); + mb(); // Update the read index SetNextReadLocation(InRingInfo, nextReadLocation); diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 4ad40be0bdfc..72bb08f24392 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -426,7 +426,7 @@ VmbusOnMsgDPC( // Make sure the write to MessageType (ie set to HvMessageTypeNone) happens // before we read the MessagePending and EOMing. Otherwise, the EOMing will not deliver // any more messages since there is no empty slot - MemoryFence(); + mb(); if (msg->Header.MessageFlags.MessagePending) { diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index 504d585e713e..467196d0044f 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -119,8 +119,6 @@ extern void PageFree(void* page, unsigned int count); extern void* MemMapIO(unsigned long phys, unsigned long size); extern void MemUnmapIO(void* virt); -extern void MemoryFence(void); - extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context); extern void TimerClose(HANDLE hTimer); extern int TimerStop(HANDLE hTimer); diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index 0c2ad4916cb2..7a4c4381fd4d 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -197,11 +197,6 @@ void MemUnmapIO(void *virt) //iounmap(virt); } -void MemoryFence() -{ - mb(); -} - void TimerCallback(unsigned long data) { TIMER* t = (TIMER*)data; -- 2.20.1