diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
| commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
| tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /arch/mips/kvm/mmu.c | |
| parent | x86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff) | |
| parent | x86/cpufeatures: Enable new AVX512 cpu features (diff) | |
| download | linux-dev-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz linux-dev-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip | |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/kvm/mmu.c')
| -rw-r--r-- | arch/mips/kvm/mmu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index 03883ba806e2..3b677c851be0 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -260,13 +260,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if ((vcpu->arch.guest_user_asid[cpu] ^ asid_cache(cpu)) & asid_version_mask(cpu)) { - u32 gasid = kvm_read_c0_guest_entryhi(vcpu->arch.cop0) & - KVM_ENTRYHI_ASID; - kvm_get_new_mmu_context(&vcpu->arch.guest_user_mm, cpu, vcpu); vcpu->arch.guest_user_asid[cpu] = vcpu->arch.guest_user_mm.context.asid[cpu]; - vcpu->arch.last_user_gasid = gasid; newasid++; kvm_debug("[%d]: cpu_context: %#lx\n", cpu, |