diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:22:34 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:22:34 +0100 |
commit | c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563 (patch) | |
tree | d04a7861e542665bb7c03aac729a72c957be8abc /include/linux/hyperv.h | |
parent | Merge tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next (diff) | |
parent | Linux 4.20-rc6 (diff) | |
download | wireguard-linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.tar.xz wireguard-linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.zip |
Merge 4.20-rc6 into char-misc-next
This should resolve the hv driver merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/hyperv.h')
-rw-r--r-- | include/linux/hyperv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 07a367f5e22f..f0885cc01db6 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -896,6 +896,13 @@ struct vmbus_channel { bool probe_done; + /* + * We must offload the handling of the primary/sub channels + * from the single-threaded vmbus_connection.work_queue to + * two different workqueue, otherwise we can block + * vmbus_connection.work_queue and hang: see vmbus_process_offer(). + */ + struct work_struct add_channel_work; }; static inline bool is_hvsock_channel(const struct vmbus_channel *c) |