diff options
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 04fa1b8298c8..d9dcfa27aa84 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -1626,7 +1626,7 @@ static void reload_tss(void) | |||
1626 | /* | 1626 | /* |
1627 | * VT restores TR but not its size. Useless. | 1627 | * VT restores TR but not its size. Useless. |
1628 | */ | 1628 | */ |
1629 | struct desc_ptr *gdt = &__get_cpu_var(host_gdt); | 1629 | struct desc_ptr *gdt = this_cpu_ptr(&host_gdt); |
1630 | struct desc_struct *descs; | 1630 | struct desc_struct *descs; |
1631 | 1631 | ||
1632 | descs = (void *)gdt->address; | 1632 | descs = (void *)gdt->address; |
@@ -1672,7 +1672,7 @@ static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset) | |||
1672 | 1672 | ||
1673 | static unsigned long segment_base(u16 selector) | 1673 | static unsigned long segment_base(u16 selector) |
1674 | { | 1674 | { |
1675 | struct desc_ptr *gdt = &__get_cpu_var(host_gdt); | 1675 | struct desc_ptr *gdt = this_cpu_ptr(&host_gdt); |
1676 | struct desc_struct *d; | 1676 | struct desc_struct *d; |
1677 | unsigned long table_base; | 1677 | unsigned long table_base; |
1678 | unsigned long v; | 1678 | unsigned long v; |
@@ -1802,7 +1802,7 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx) | |||
1802 | */ | 1802 | */ |
1803 | if (!user_has_fpu() && !vmx->vcpu.guest_fpu_loaded) | 1803 | if (!user_has_fpu() && !vmx->vcpu.guest_fpu_loaded) |
1804 | stts(); | 1804 | stts(); |
1805 | load_gdt(&__get_cpu_var(host_gdt)); | 1805 | load_gdt(this_cpu_ptr(&host_gdt)); |
1806 | } | 1806 | } |
1807 | 1807 | ||
1808 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | 1808 | static void vmx_load_host_state(struct vcpu_vmx *vmx) |
@@ -1832,7 +1832,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
1832 | } | 1832 | } |
1833 | 1833 | ||
1834 | if (vmx->loaded_vmcs->cpu != cpu) { | 1834 | if (vmx->loaded_vmcs->cpu != cpu) { |
1835 | struct desc_ptr *gdt = &__get_cpu_var(host_gdt); | 1835 | struct desc_ptr *gdt = this_cpu_ptr(&host_gdt); |
1836 | unsigned long sysenter_esp; | 1836 | unsigned long sysenter_esp; |
1837 | 1837 | ||
1838 | kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu); | 1838 | kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu); |
@@ -2771,7 +2771,7 @@ static int hardware_enable(void) | |||
2771 | ept_sync_global(); | 2771 | ept_sync_global(); |
2772 | } | 2772 | } |
2773 | 2773 | ||
2774 | native_store_gdt(&__get_cpu_var(host_gdt)); | 2774 | native_store_gdt(this_cpu_ptr(&host_gdt)); |
2775 | 2775 | ||
2776 | return 0; | 2776 | return 0; |
2777 | } | 2777 | } |