diff options
Diffstat (limited to 'f11.patch')
| -rw-r--r-- | f11.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/f11.patch b/f11.patch new file mode 100644 index 00000000000000..c0727f56f70fc4 --- /dev/null +++ b/f11.patch @@ -0,0 +1,95 @@ +--- + drivers/hv/channel.c | 10 ---------- + drivers/hv/vmbus_drv.c | 31 ++++++++++++++----------------- + include/linux/hyperv.h | 8 -------- + 3 files changed, 14 insertions(+), 35 deletions(-) + +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -60,16 +60,6 @@ static void vmbus_setevent(struct vmbus_ + } + + /* +- * vmbus_get_debug_info -Retrieve various channel debug info +- */ +-void vmbus_get_debug_info(struct vmbus_channel *channel, +- struct vmbus_channel_debug_info *debuginfo) +-{ +- hv_ringbuffer_get_debuginfo(&channel->inbound, &debuginfo->inbound); +- hv_ringbuffer_get_debuginfo(&channel->outbound, &debuginfo->outbound); +-} +- +-/* + * vmbus_open - Open the specified channel. + */ + int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, +--- a/drivers/hv/vmbus_drv.c ++++ b/drivers/hv/vmbus_drv.c +@@ -63,29 +63,26 @@ static int vmbus_exists(void) + static void get_channel_info(struct hv_device *device, + struct hv_device_info *info) + { +- struct vmbus_channel_debug_info debug_info; ++ struct hv_ring_buffer_debug_info inbound; ++ struct hv_ring_buffer_debug_info outbound; + + if (!device->channel) + return; + +- vmbus_get_debug_info(device->channel, &debug_info); ++ hv_ringbuffer_get_debuginfo(&device->channel->inbound, &inbound); ++ hv_ringbuffer_get_debuginfo(&device->channel->outbound, &outbound); + +- info->inbound.int_mask = debug_info.inbound.current_interrupt_mask; +- info->inbound.read_idx = debug_info.inbound.current_read_index; +- info->inbound.write_idx = debug_info.inbound.current_write_index; +- info->inbound.bytes_avail_toread = +- debug_info.inbound.bytes_avail_toread; +- info->inbound.bytes_avail_towrite = +- debug_info.inbound.bytes_avail_towrite; ++ info->inbound.int_mask = inbound.current_interrupt_mask; ++ info->inbound.read_idx = inbound.current_read_index; ++ info->inbound.write_idx = inbound.current_write_index; ++ info->inbound.bytes_avail_toread = inbound.bytes_avail_toread; ++ info->inbound.bytes_avail_towrite = inbound.bytes_avail_towrite; + +- info->outbound.int_mask = +- debug_info.outbound.current_interrupt_mask; +- info->outbound.read_idx = debug_info.outbound.current_read_index; +- info->outbound.write_idx = debug_info.outbound.current_write_index; +- info->outbound.bytes_avail_toread = +- debug_info.outbound.bytes_avail_toread; +- info->outbound.bytes_avail_towrite = +- debug_info.outbound.bytes_avail_towrite; ++ info->outbound.int_mask = outbound.current_interrupt_mask; ++ info->outbound.read_idx = outbound.current_read_index; ++ info->outbound.write_idx = outbound.current_write_index; ++ info->outbound.bytes_avail_toread = outbound.bytes_avail_toread; ++ info->outbound.bytes_avail_towrite = outbound.bytes_avail_towrite; + } + + #define VMBUS_ALIAS_LEN ((sizeof((struct hv_vmbus_device_id *)0)->guid) * 2) +--- a/include/linux/hyperv.h ++++ b/include/linux/hyperv.h +@@ -899,11 +899,6 @@ enum vmbus_channel_state { + CHANNEL_OPENED_STATE, + }; + +-struct vmbus_channel_debug_info { +- struct hv_ring_buffer_debug_info inbound; +- struct hv_ring_buffer_debug_info outbound; +-}; +- + /* + * Represents each channel msg on the vmbus connection This is a + * variable-size data structure depending on the msg type itself +@@ -1169,9 +1164,6 @@ extern int vmbus_recvpacket_raw(struct v + u64 *requestid); + + +-extern void vmbus_get_debug_info(struct vmbus_channel *channel, +- struct vmbus_channel_debug_info *debug); +- + extern void vmbus_ontimer(unsigned long data); + + struct hv_dev_port_info { |