From d23148135ae998e7dac8a7f8f1d1e8fc2037fe57 Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Thu, 5 Aug 2010 19:30:01 +0000
Subject: [PATCH] --- yaml --- r: 210236 b: refs/heads/master c:
 e5fa721d1c2a54261a37eb59686e18dee34b6af6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7ce7822d6cd8..37ae3b9013dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c47a70a9a8a6d1ec37a53d2f9cb82f8b8ef8aa2
+refs/heads/master: e5fa721d1c2a54261a37eb59686e18dee34b6af6
diff --git a/trunk/drivers/staging/hv/ring_buffer.c b/trunk/drivers/staging/hv/ring_buffer.c
index 17bc7626f70a..d78c569ac94a 100644
--- a/trunk/drivers/staging/hv/ring_buffer.c
+++ b/trunk/drivers/staging/hv/ring_buffer.c
@@ -193,8 +193,7 @@ GetRingBufferSize(struct hv_ring_buffer_info *RingInfo)
 static inline u64
 GetRingBufferIndices(struct hv_ring_buffer_info *RingInfo)
 {
-	return ((u64)RingInfo->RingBuffer->WriteIndex << 32)
-	|| RingInfo->RingBuffer->ReadIndex;
+	return (u64)RingInfo->RingBuffer->WriteIndex << 32;
 }