diff options
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 5 | ||||
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index ec891a2ce86e..ea1b6c615f9f 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
@@ -716,11 +716,6 @@ static inline void kvm_load_ldt(u16 sel) | |||
716 | asm("lldt %0" : : "rm"(sel)); | 716 | asm("lldt %0" : : "rm"(sel)); |
717 | } | 717 | } |
718 | 718 | ||
719 | static inline void kvm_get_idt(struct desc_ptr *table) | ||
720 | { | ||
721 | asm("sidt %0" : "=m"(*table)); | ||
722 | } | ||
723 | |||
724 | #ifdef CONFIG_X86_64 | 719 | #ifdef CONFIG_X86_64 |
725 | static inline unsigned long read_msr(unsigned long msr) | 720 | static inline unsigned long read_msr(unsigned long msr) |
726 | { | 721 | { |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 3dbfc20824b7..33d88e0a0601 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -2452,7 +2452,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) | |||
2452 | 2452 | ||
2453 | vmcs_write16(HOST_TR_SELECTOR, GDT_ENTRY_TSS*8); /* 22.2.4 */ | 2453 | vmcs_write16(HOST_TR_SELECTOR, GDT_ENTRY_TSS*8); /* 22.2.4 */ |
2454 | 2454 | ||
2455 | kvm_get_idt(&dt); | 2455 | native_store_idt(&dt); |
2456 | vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */ | 2456 | vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */ |
2457 | 2457 | ||
2458 | asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); | 2458 | asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); |