diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-12-16 22:26:38 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-12-16 22:26:38 +0000 |
| commit | 5160866ad9ec4f3e3d2bf7b949303486a9110336 (patch) | |
| tree | 5735ae0a118dff41b7e7dd395406101fe7ede944 /xen/include/asm-x86 | |
| parent | f7a1cb1c2fd8ae8aab9641149b09853ed7e51a63 (diff) | |
| download | xen-5160866ad9ec4f3e3d2bf7b949303486a9110336.tar.gz xen-5160866ad9ec4f3e3d2bf7b949303486a9110336.tar.bz2 xen-5160866ad9ec4f3e3d2bf7b949303486a9110336.zip | |
hvm: Clean up RDTSCP/TSC_AUX handling.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/include/asm-x86')
| -rw-r--r-- | xen/include/asm-x86/hvm/vcpu.h | 2 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/vmx/vmcs.h | 1 | ||||
| -rw-r--r-- | xen/include/asm-x86/msr.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 463f8f95b9..80c4d5b073 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -73,6 +73,8 @@ struct hvm_vcpu { u64 asid_generation; u32 asid; + u32 msr_tsc_aux; + union { struct arch_vmx_struct vmx; struct arch_svm_struct svm; diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 44b6e4cae4..ed77451afb 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -44,7 +44,6 @@ enum { VMX_INDEX_MSR_LSTAR = 0, VMX_INDEX_MSR_STAR, VMX_INDEX_MSR_SYSCALL_MASK, - VMX_INDEX_MSR_TSC_AUX, VMX_MSR_COUNT }; diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index a65f080569..f84c0dddf8 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -84,7 +84,7 @@ static inline void wrmsrl(unsigned int msr, __u64 val) #define write_tsc(val) wrmsrl(MSR_IA32_TSC, val) -#define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0) +#define write_rdtscp_aux(val) wrmsr(MSR_TSC_AUX, (val), 0) #define rdpmc(counter,low,high) \ __asm__ __volatile__("rdpmc" \ |