diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-25 11:19:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-25 11:19:53 -0700 |
| commit | 087713f4548e598be64bce28bae36009d41038a4 (patch) | |
| tree | 3eb0b464eee846a6f79daf16910cc1d37ddbfa4f /include | |
| parent | 7cf0bed9c322992c7d5f912cb9a83d2809e71881 (diff) | |
| parent | 1327138e294ffda120a50c8f31d792addb196c79 (diff) | |
| download | linux-087713f4548e598be64bce28bae36009d41038a4.tar.gz linux-087713f4548e598be64bce28bae36009d41038a4.tar.bz2 linux-087713f4548e598be64bce28bae36009d41038a4.zip | |
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')
| -rw-r--r-- | include/asm-x86/kvm_host.h | 2 | ||||
| -rw-r--r-- | include/linux/kvm.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 0f3c53114614..c2e34c275900 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h @@ -722,7 +722,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void); #define __kvm_handle_fault_on_reboot(insn) \ "666: " insn "\n\t" \ - ".pushsection .text.fixup, \"ax\" \n" \ + ".pushsection .fixup, \"ax\" \n" \ "667: \n\t" \ KVM_EX_PUSH " $666b \n\t" \ "jmp kvm_handle_fault_on_reboot \n\t" \ 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 |