diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-26 14:15:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-26 14:15:54 -0400 |
commit | 0dc82fa59b9d82469799c354d3307d48e13d5d5e (patch) | |
tree | 7cfb62fecd04557a9e44a69a6db65138ea8ccf74 /include/linux | |
parent | 9e54ef9da519d9febfa61fa9392276fbfa6ce79c (diff) | |
parent | 5c1724c42dc1d60addaa67106a4f25c2a9a140de (diff) |
Merge tag 'char-misc-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"A smattering of different small fixes for some random driver
subsystems. Nothing all that major, just resolutions for reported
issues and bugs.
All have been in linux-next with no reported issues"
* tag 'char-misc-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (21 commits)
extcon: int3496: Set the id pin to direction-input if necessary
extcon: int3496: Use gpiod_get instead of gpiod_get_index
extcon: int3496: Add dependency on X86 as it's Intel specific
extcon: int3496: Add GPIO ACPI mapping table
extcon: int3496: Rename GPIO pins in accordance with binding
vmw_vmci: handle the return value from pci_alloc_irq_vectors correctly
ppdev: fix registering same device name
parport: fix attempt to write duplicate procfiles
auxdisplay: img-ascii-lcd: add missing sentinel entry in img_ascii_lcd_matches
Drivers: hv: vmbus: Don't leak memory when a channel is rescinded
Drivers: hv: vmbus: Don't leak channel ids
Drivers: hv: util: don't forget to init host_ts.lock
Drivers: hv: util: move waiting for release to hv_utils_transport itself
vmbus: remove hv_event_tasklet_disable/enable
vmbus: use rcu for per-cpu channel list
mei: don't wait for os version message reply
mei: fix deadlock on mei reset
intel_th: pci: Add Gemini Lake support
intel_th: pci: Add Denverton SOC support
intel_th: Don't leak module refcount on failure to activate
...
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hyperv.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 62bbf3c1aa4a..970771a5f739 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
@@ -845,6 +845,13 @@ struct vmbus_channel { | |||
845 | * link up channels based on their CPU affinity. | 845 | * link up channels based on their CPU affinity. |
846 | */ | 846 | */ |
847 | struct list_head percpu_list; | 847 | struct list_head percpu_list; |
848 | |||
849 | /* | ||
850 | * Defer freeing channel until after all cpu's have | ||
851 | * gone through grace period. | ||
852 | */ | ||
853 | struct rcu_head rcu; | ||
854 | |||
848 | /* | 855 | /* |
849 | * For performance critical channels (storage, networking | 856 | * For performance critical channels (storage, networking |
850 | * etc,), Hyper-V has a mechanism to enhance the throughput | 857 | * etc,), Hyper-V has a mechanism to enhance the throughput |
@@ -1430,9 +1437,6 @@ extern bool vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, u8 *buf, | |||
1430 | const int *srv_version, int srv_vercnt, | 1437 | const int *srv_version, int srv_vercnt, |
1431 | int *nego_fw_version, int *nego_srv_version); | 1438 | int *nego_fw_version, int *nego_srv_version); |
1432 | 1439 | ||
1433 | void hv_event_tasklet_disable(struct vmbus_channel *channel); | ||
1434 | void hv_event_tasklet_enable(struct vmbus_channel *channel); | ||
1435 | |||
1436 | void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid); | 1440 | void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid); |
1437 | 1441 | ||
1438 | void vmbus_setevent(struct vmbus_channel *channel); | 1442 | void vmbus_setevent(struct vmbus_channel *channel); |