From 6df2754f74ef3069f8a3150dbb78d9182b04576b Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:21 -0700 Subject: [PATCH] --- yaml --- r: 249537 b: refs/heads/master c: 72a95cbcbc24a464f3a51e610bd444fde2c73bbd h: refs/heads/master i: 249535: f18d996d0a9ac912c66b347cd1c0d2293483c4cb v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/channel.c | 7 +++++-- trunk/drivers/staging/hv/ring_buffer.c | 4 ++-- trunk/drivers/staging/hv/ring_buffer.h | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 229831af0254..d0075e8f8b34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1745ec504a80c620a7c9b9df5a03de56cfbd85d5 +refs/heads/master: 72a95cbcbc24a464f3a51e610bd444fde2c73bbd diff --git a/trunk/drivers/staging/hv/channel.c b/trunk/drivers/staging/hv/channel.c index b53be5847a34..43e54b514d44 100644 --- a/trunk/drivers/staging/hv/channel.c +++ b/trunk/drivers/staging/hv/channel.c @@ -201,13 +201,16 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, newchannel->ringbuffer_pagecount = (send_ringbuffer_size + recv_ringbuffer_size) >> PAGE_SHIFT; - ret = ringbuffer_init(&newchannel->outbound, out, send_ringbuffer_size); + ret = hv_ringbuffer_init( + &newchannel->outbound, out, send_ringbuffer_size); + if (ret != 0) { err = ret; goto errorout; } - ret = ringbuffer_init(&newchannel->inbound, in, recv_ringbuffer_size); + ret = hv_ringbuffer_init( + &newchannel->inbound, in, recv_ringbuffer_size); if (ret != 0) { err = ret; goto errorout; diff --git a/trunk/drivers/staging/hv/ring_buffer.c b/trunk/drivers/staging/hv/ring_buffer.c index 66e1b3f16d9a..9653ab5022dd 100644 --- a/trunk/drivers/staging/hv/ring_buffer.c +++ b/trunk/drivers/staging/hv/ring_buffer.c @@ -299,13 +299,13 @@ u32 get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *rbi) /*++ Name: - ringbuffer_init() + hv_ringbuffer_init() Description: Initialize the ring buffer --*/ -int ringbuffer_init(struct hv_ring_buffer_info *ring_info, +int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, u32 buflen) { if (sizeof(struct hv_ring_buffer) != PAGE_SIZE) diff --git a/trunk/drivers/staging/hv/ring_buffer.h b/trunk/drivers/staging/hv/ring_buffer.h index 7bf20d67187b..3c66dc040e05 100644 --- a/trunk/drivers/staging/hv/ring_buffer.h +++ b/trunk/drivers/staging/hv/ring_buffer.h @@ -18,6 +18,7 @@ * Authors: * Haiyang Zhang * Hank Janssen + * K. Y. Srinivasan * */ @@ -75,7 +76,7 @@ struct hv_ring_buffer_debug_info { /* Interface */ -int ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, +int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, u32 buflen); void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);