KVM: x86: fix warning on 32-bit compilation

bonzini · bonzini · commit ac146235d47c · 2014-11-10T13:53:25.000+01:00
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 &lt;pbonzini@redhat.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,9 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);`
`750`	`750`
`751`	`751`	`int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)`
`752`	`752`	`{`
	`753`	`+#ifdef CONFIG_X86_64`
`753`	`754`	`cr3 &= ~CR3_PCID_INVD;`
	`755`	`+#endif`
`754`	`756`
`755`	`757`	`if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {`
`756`	`758`	`kvm_mmu_sync_roots(vcpu);`