[PATCH 3/5] staging: hv: Fixed the value of the 64bit-hole inside ring buffer

DORMANTno replies

From: Hank Janssen <hidden>
Date: 2010-08-05 19:30:10
Also in: lkml
Subsystem: staging subsystem, the rest · Maintainers: Greg Kroah-Hartman, Linus Torvalds

From: Haiyang Zhang <haiyangz@microsoft.com>

Fixed the value of the 64bit-hole inside ring buffer, this
caused a problem on Hyper-V when running checked Windows builds.

Checked builds of Windows are used internally and given to external system
integrators at times. They are builds that for example that all elements in a
structure follow the definition of that Structure. The bug this fixed was for a
field that we did not fill in at all (Because we do Not use it on the Linux side),
and the checked build of windows gives errors on it internally to the Windows logs.

This fixes that error.

Signed-off-by:Hank Janssen [off-list ref]
Signed-off-by:Haiyang Zhang [off-list ref]
Cc: stable <stable@kernel.org>
---
 drivers/staging/hv/ring_buffer.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index 66a4974..133f909 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -192,8 +192,7 @@ Description:
 static inline u64
 GetRingBufferIndices(RING_BUFFER_INFO *RingInfo)  {
-	return ((u64)RingInfo->RingBuffer->WriteIndex << 32)
-	|| RingInfo->RingBuffer->ReadIndex;
+	return (u64)RingInfo->RingBuffer->WriteIndex << 32;
 }
 
 
--
1.6.0.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help