summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaiyang Zhang <haiyangz@microsoft.com>2010-08-05 19:30:01 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-03 17:37:15 -0700
commite5fa721d1c2a54261a37eb59686e18dee34b6af6 (patch)
tree971ea20394776acbc84abd081aa8212dcba02f28
parent0c47a70a9a8a6d1ec37a53d2f9cb82f8b8ef8aa2 (diff)
downloadblackbird-op-linux-e5fa721d1c2a54261a37eb59686e18dee34b6af6.tar.gz
blackbird-op-linux-e5fa721d1c2a54261a37eb59686e18dee34b6af6.zip
staging: hv: Fixed the value of the 64bit-hole inside ring buffer
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 <hjanssen@microsoft.com> Signed-off-by:Haiyang Zhang <haiyangz@microsoft.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/hv/ring_buffer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index 17bc7626f70a..d78c569ac94a 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -193,8 +193,7 @@ Description:
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;
}
OpenPOWER on IntegriCloud