From a51158fc820ea18fbde40dec0d51d89dd0b0a2c1 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:27 -0700 Subject: [PATCH] --- yaml --- r: 249543 b: refs/heads/master c: 549bf93f2853634383ae850d52afa1f4f656cb38 h: refs/heads/master i: 249541: 04eae0955cb17a512204ccec00f0684fea7ca42f 249539: e003068998efecfdf227003aab9eff1f370d5e68 249535: f18d996d0a9ac912c66b347cd1c0d2293483c4cb v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/channel.c | 4 ++-- trunk/drivers/staging/hv/ring_buffer.c | 4 ++-- trunk/drivers/staging/hv/ring_buffer.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 76f4183e4418..1dc70c47fc14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: decc49dacba39354ee705ea8bec12d9ae1f63774 +refs/heads/master: 549bf93f2853634383ae850d52afa1f4f656cb38 diff --git a/trunk/drivers/staging/hv/channel.c b/trunk/drivers/staging/hv/channel.c index 3274b2950485..be4e00444e72 100644 --- a/trunk/drivers/staging/hv/channel.c +++ b/trunk/drivers/staging/hv/channel.c @@ -1001,6 +1001,6 @@ void vmbus_ontimer(unsigned long data) static void dump_vmbus_channel(struct vmbus_channel *channel) { DPRINT_DBG(VMBUS, "Channel (%d)", channel->offermsg.child_relid); - dump_ring_info(&channel->outbound, "Outbound "); - dump_ring_info(&channel->inbound, "Inbound "); + hv_dump_ring_info(&channel->outbound, "Outbound "); + hv_dump_ring_info(&channel->inbound, "Inbound "); } diff --git a/trunk/drivers/staging/hv/ring_buffer.c b/trunk/drivers/staging/hv/ring_buffer.c index 013b7a5bd2e8..abf009114f0b 100644 --- a/trunk/drivers/staging/hv/ring_buffer.c +++ b/trunk/drivers/staging/hv/ring_buffer.c @@ -203,13 +203,13 @@ get_ring_bufferindices(struct hv_ring_buffer_info *ring_info) /*++ Name: - dump_ring_info() + hv_dump_ring_info() Description: Dump out to console the ring buffer info --*/ -void dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix) +void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix) { u32 bytes_avail_towrite; u32 bytes_avail_toread; diff --git a/trunk/drivers/staging/hv/ring_buffer.h b/trunk/drivers/staging/hv/ring_buffer.h index 64541055b2df..61470a3cb518 100644 --- a/trunk/drivers/staging/hv/ring_buffer.h +++ b/trunk/drivers/staging/hv/ring_buffer.h @@ -95,7 +95,7 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *ring_info, u32 hv_get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info); -void dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix); +void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix); void ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info, struct hv_ring_buffer_debug_info *debug_info);