diff --git a/[refs] b/[refs] index e24aecf11a95..bdc36c650a48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd5998ebfbc9e6cb44408efa217c15d7eea13675 +refs/heads/master: 1327138e294ffda120a50c8f31d792addb196c79 diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 69511f74f912..70a30651cd12 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -320,12 +320,12 @@ struct kvm_trace_rec { struct { __u64 cycle_u64; __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } cycle; + } __attribute__((packed)) cycle; struct { __u32 extra_u32[KVM_TRC_EXTRA_MAX]; } nocycle; } u; -} __attribute__((packed)); +}; #define KVMIO 0xAE