From 368f8fa7041ef8f9cf2169159a7372571d30d827 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 27 Jul 2010 11:47:08 -0700
Subject: [PATCH] --- yaml --- r: 206009 b: refs/heads/master c:
 4a1b3acc909ca02bdb286d3dd498262e89875b49 h: refs/heads/master i:   206007:
 121078849330a7d200a099127f173db8bd659f3f v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/hv/ring_buffer.c | 6 +++---
 trunk/drivers/staging/hv/ring_buffer.h | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3aa3ab236772..0f2ae43b94dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a0e1c5505e8784c0a5f8cb0141ab45bd3de5f57
+refs/heads/master: 4a1b3acc909ca02bdb286d3dd498262e89875b49
diff --git a/trunk/drivers/staging/hv/ring_buffer.c b/trunk/drivers/staging/hv/ring_buffer.c
index f4efe7feee94..17bc7626f70a 100644
--- a/trunk/drivers/staging/hv/ring_buffer.c
+++ b/trunk/drivers/staging/hv/ring_buffer.c
@@ -302,16 +302,16 @@ u32 GetRingBufferInterruptMask(struct hv_ring_buffer_info *rbi)
 --*/
 int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer, u32 BufferLen)
 {
-	if (sizeof(RING_BUFFER) != PAGE_SIZE)
+	if (sizeof(struct hv_ring_buffer) != PAGE_SIZE)
 		return -EINVAL;
 
 	memset(RingInfo, 0, sizeof(struct hv_ring_buffer_info));
 
-	RingInfo->RingBuffer = (RING_BUFFER *)Buffer;
+	RingInfo->RingBuffer = (struct hv_ring_buffer *)Buffer;
 	RingInfo->RingBuffer->ReadIndex = RingInfo->RingBuffer->WriteIndex = 0;
 
 	RingInfo->RingSize = BufferLen;
-	RingInfo->RingDataSize = BufferLen - sizeof(RING_BUFFER);
+	RingInfo->RingDataSize = BufferLen - sizeof(struct hv_ring_buffer);
 
 	spin_lock_init(&RingInfo->ring_lock);
 
diff --git a/trunk/drivers/staging/hv/ring_buffer.h b/trunk/drivers/staging/hv/ring_buffer.h
index 2d941f3eab0c..a7f1717c6a56 100644
--- a/trunk/drivers/staging/hv/ring_buffer.h
+++ b/trunk/drivers/staging/hv/ring_buffer.h
@@ -27,7 +27,7 @@
 
 #include <linux/scatterlist.h>
 
-typedef struct _RING_BUFFER {
+struct hv_ring_buffer {
 	/* Offset in bytes from the start of ring data below */
 	volatile u32 WriteIndex;
 
@@ -51,10 +51,10 @@ typedef struct _RING_BUFFER {
 	 * !!! DO NOT place any fields below this !!!
 	 */
 	u8 Buffer[0];
-} __attribute__((packed)) RING_BUFFER;
+} __attribute__((packed));
 
 struct hv_ring_buffer_info {
-	RING_BUFFER *RingBuffer;
+	struct hv_ring_buffer *RingBuffer;
 	u32 RingSize;			/* Include the shared header */
 	spinlock_t ring_lock;