diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-01 16:43:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-01 16:43:50 +0100 |
| commit | 99f63620b484b421c480d5048d8ab88a0bacb7ac (patch) | |
| tree | 99ec8410197d25b3051f8e13bd3db9bf91f9c0d1 /drivers/hv/hyperv_vmbus.h | |
| parent | b3bf147bd6117f2cc493c6371c6f0be659b0dd96 (diff) | |
| parent | 396ae57ef1ef978d1d21cdb7586ba184a3f22453 (diff) | |
| download | lwn-99f63620b484b421c480d5048d8ab88a0bacb7ac.tar.gz lwn-99f63620b484b421c480d5048d8ab88a0bacb7ac.zip | |
Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux into char-misc-next
Sasha writes:
1. Exopsing counters for state changes of channel ring buffers; this is
useful to investigate performance issues. By Kimberly Brown.
2. Switching to the new generic UUID API, by Andy Shevchenko.
* tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
Drivers: hv: vmbus: Expose counters for interrupts and full conditions
vmbus: Switch to use new generic UUID API
Diffstat (limited to 'drivers/hv/hyperv_vmbus.h')
| -rw-r--r-- | drivers/hv/hyperv_vmbus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index a1f6ce6e5974..cb86b133eb4d 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -312,8 +312,8 @@ extern const struct vmbus_channel_message_table_entry /* General vmbus interface */ -struct hv_device *vmbus_device_create(const uuid_le *type, - const uuid_le *instance, +struct hv_device *vmbus_device_create(const guid_t *type, + const guid_t *instance, struct vmbus_channel *channel); int vmbus_device_register(struct hv_device *child_device_obj); |