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 'kvm-arm-for-4.8-take2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
include
/
uapi
/
linux
/
kvm.h
diff --git
a/include/uapi/linux/kvm.h
b/include/uapi/linux/kvm.h
index
e98bb4c
..
300ef25
100644
(file)
--- a/
include/uapi/linux/kvm.h
+++ b/
include/uapi/linux/kvm.h
@@
-882,7
+882,10
@@
struct kvm_irq_routing_msi {
__u32 address_lo;
__u32 address_hi;
__u32 data;
- __u32 pad;
+ union {
+ __u32 pad;
+ __u32 devid;
+ };
};
struct kvm_irq_routing_s390_adapter {