diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-25 14:19:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-25 14:19:53 -0400 |
| commit | 087713f4548e598be64bce28bae36009d41038a4 (patch) | |
| tree | 3eb0b464eee846a6f79daf16910cc1d37ddbfa4f /include/linux | |
| parent | 7cf0bed9c322992c7d5f912cb9a83d2809e71881 (diff) | |
| parent | 1327138e294ffda120a50c8f31d792addb196c79 (diff) | |
Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: fix userspace ABI breakage
KVM: MMU: Fix torn shadow pte
KVM: Use .fixup instead of .text.fixup on __kvm_handle_fault_on_reboot
Diffstat (limited to 'include/linux')
| -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 | ||