diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-05-05 08:20:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-05-05 08:21:03 +0200 |
| commit | 415812f2d6b856d33ede9bf4a2b95575dbbb3d4e (patch) | |
| tree | 4daf9ca52f89ea59453538b406f584d47c77aff3 /arch/x86/kvm/svm.c | |
| parent | 42fc6c6cb1662ba2fa727dd01c9473c63be4e3b6 (diff) | |
| parent | d3b5d35290d729a2518af00feca867385a1b08fa (diff) | |
| download | blackbird-obmc-linux-415812f2d6b856d33ede9bf4a2b95575dbbb3d4e.tar.gz blackbird-obmc-linux-415812f2d6b856d33ede9bf4a2b95575dbbb3d4e.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
We are going to fix a bug introduced by a more recent commit, so
refresh the tree.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 5fba70646c32..5f48f62b8dc2 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -741,7 +741,6 @@ static int svm_hardware_enable(void) struct svm_cpu_data *sd; uint64_t efer; - struct desc_ptr gdt_descr; struct desc_struct *gdt; int me = raw_smp_processor_id(); @@ -763,8 +762,7 @@ static int svm_hardware_enable(void) sd->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1; sd->next_asid = sd->max_asid + 1; - native_store_gdt(&gdt_descr); - gdt = (struct desc_struct *)gdt_descr.address; + gdt = get_current_gdt_rw(); sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS); wrmsrl(MSR_EFER, efer | EFER_SVME); |
