diff --git a/[refs] b/[refs] index 32676feff077..219345298ada 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7581578d688397d927b882a343a2969ef0cac12a +refs/heads/master: 66a605438146923a048a2ce071831df2a5f64659 diff --git a/trunk/drivers/staging/hv/ring_buffer.c b/trunk/drivers/staging/hv/ring_buffer.c index 2a461ddeeaca..badf52ad2416 100644 --- a/trunk/drivers/staging/hv/ring_buffer.c +++ b/trunk/drivers/staging/hv/ring_buffer.c @@ -364,7 +364,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info, u32 totalbytes_towrite = 0; struct scatterlist *sg; - volatile u32 next_write_location; + u32 next_write_location; u64 prev_indices = 0; unsigned long flags;