Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / linux / kvm.h

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 69511f74f912682e69e4d49a9abf5198c0a4bfa3..70a30651cd128cd3dbaf91a366886764abdede33 100644 (file)
--- a/include/linux/kvm.h
+++ b/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