diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /include/linux/kvm.h | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'include/linux/kvm.h')
| -rw-r--r-- | include/linux/kvm.h | 4 |
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 { | |||
| 320 | struct { | 320 | struct { |
| 321 | __u64 cycle_u64; | 321 | __u64 cycle_u64; |
| 322 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; | 322 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; |
| 323 | } cycle; | 323 | } __attribute__((packed)) cycle; |
| 324 | struct { | 324 | struct { |
| 325 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; | 325 | __u32 extra_u32[KVM_TRC_EXTRA_MAX]; |
| 326 | } nocycle; | 326 | } nocycle; |
| 327 | } u; | 327 | } u; |
| 328 | } __attribute__((packed)); | 328 | }; |
| 329 | 329 | ||
| 330 | #define KVMIO 0xAE | 330 | #define KVMIO 0xAE |
| 331 | 331 | ||