1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c
index 490e9ea098e6..87799e81af97 100644
--- a/drivers/hv/ring_buffer.c
+++ b/drivers/hv/ring_buffer.c
@@ -112,7 +112,8 @@ hv_get_next_readlocation_withoffset(const struct hv_ring_buffer_info *ring_info,
         u32 next = ring_info->ring_buffer->read_index;
 
         next += offset;
-        next %= ring_info->ring_datasize;
+        if (next >= ring_info->ring_datasize)
+                next -= ring_info->ring_datasize;
 
         return next;
 }
@@ -156,7 +157,8 @@ static u32 hv_copyfrom_ringbuffer(
         memcpy(dest, ring_buffer + start_read_offset, destlen);
 
         start_read_offset += destlen;
-        start_read_offset %= ring_buffer_size;
+        if (start_read_offset >= ring_buffer_size)
+                start_read_offset -= ring_buffer_size;
 
         return start_read_offset;
 }
@@ -178,7 +180,8 @@ static u32 hv_copyto_ringbuffer(
         memcpy(ring_buffer + start_write_offset, src, srclen);
 
         start_write_offset += srclen;
-        start_write_offset %= ring_buffer_size;
+        if (start_write_offset >= ring_buffer_size)
+                start_write_offset -= ring_buffer_size;
 
         return start_write_offset;
 }