projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'samsung-pm-1' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene...
[cascardo/linux.git]
/
include
/
linux
/
hyperv.h
diff --git
a/include/linux/hyperv.h
b/include/linux/hyperv.h
index
15da677
..
344883d
100644
(file)
--- a/
include/linux/hyperv.h
+++ b/
include/linux/hyperv.h
@@
-875,7
+875,7
@@
struct vmbus_channel_relid_released {
struct vmbus_channel_initiate_contact {
struct vmbus_channel_message_header header;
u32 vmbus_version_requested;
struct vmbus_channel_initiate_contact {
struct vmbus_channel_message_header header;
u32 vmbus_version_requested;
- u32
padding2;
+ u32
target_vcpu; /* The VCPU the host should respond to */
u64 interrupt_page;
u64 monitor_page1;
u64 monitor_page2;
u64 interrupt_page;
u64 monitor_page1;
u64 monitor_page2;