Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 69511f74f912..70a30651cd12 100644
--- 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