diff --git a/[refs] b/[refs] index 2e95ff4058cd..f62247b0b8e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98fa8cf4bcc79cb14de8fd815bbcd00dcbd7b20e +refs/heads/master: 4fa152ce24724a4a6b2edd26ca2eb7757ff5b2b8 diff --git a/trunk/drivers/hv/hyperv_vmbus.h b/trunk/drivers/hv/hyperv_vmbus.h index 895c898812bd..ac1e419d4b16 100644 --- a/trunk/drivers/hv/hyperv_vmbus.h +++ b/trunk/drivers/hv/hyperv_vmbus.h @@ -565,7 +565,6 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *ring_info, u32 buflen, u32 offset); -u32 hv_get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info); void hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info, struct hv_ring_buffer_debug_info *debug_info); diff --git a/trunk/drivers/hv/ring_buffer.c b/trunk/drivers/hv/ring_buffer.c index 9bc55f0dcf47..2a0babc95709 100644 --- a/trunk/drivers/hv/ring_buffer.c +++ b/trunk/drivers/hv/ring_buffer.c @@ -294,19 +294,6 @@ void hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info, } } - -/* - * - * hv_get_ringbuffer_interrupt_mask() - * - * Get the interrupt mask for the specified ring buffer - * - */ -u32 hv_get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *rbi) -{ - return rbi->ring_buffer->interrupt_mask; -} - /* * * hv_ringbuffer_init()