diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-10 13:53:25 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-10 13:53:25 +0100 |
| commit | ac146235d47c20dbb1da7f0f8ef35c73e24590e3 (patch) | |
| tree | 1df58d96c9d146b14f6ea5bfa2ebb6f0a8486b8d /arch/x86/kvm/x86.c | |
| parent | ce1a5e60a62f21a6b5ad3e1dee60c10f0cb2aa37 (diff) | |
| download | lwn-ac146235d47c20dbb1da7f0f8ef35c73e24590e3.tar.gz lwn-ac146235d47c20dbb1da7f0f8ef35c73e24590e3.zip | |
KVM: x86: fix warning on 32-bit compilation
PCIDs are only supported in 64-bit mode. No need to clear bit 63
of CR3 unless the host is 64-bit.
Reported by Fengguang Wu's autobuilder.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f85da5cb6aa6..aae5969370d1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -750,7 +750,9 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4); int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) { +#ifdef CONFIG_X86_64 cr3 &= ~CR3_PCID_INVD; +#endif if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) { kvm_mmu_sync_roots(vcpu); |