diff --git a/[refs] b/[refs] index af26d63caa76..bf93f1420b36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ede2ccc51742059d356d419260460cbbf3e36273 +refs/heads/master: 2f8b9ee14eb439008e0c5131116ea6baa40dba50 diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 644e3a9f47db..3db5d8d37485 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -119,7 +119,7 @@ struct kvm_run { __u32 error_code; } ex; /* KVM_EXIT_IO */ - struct kvm_io { + struct { #define KVM_EXIT_IO_IN 0 #define KVM_EXIT_IO_OUT 1 __u8 direction; @@ -224,10 +224,10 @@ struct kvm_interrupt { /* for KVM_GET_DIRTY_LOG */ struct kvm_dirty_log { __u32 slot; - __u32 padding; + __u32 padding1; union { void __user *dirty_bitmap; /* one bit per page */ - __u64 padding; + __u64 padding2; }; };