]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
KVM: x86: Remove debug assertion of non-PAE reserved bits
authorNadav Amit <namit@cs.technion.ac.il>
Tue, 23 Sep 2014 07:01:57 +0000 (10:01 +0300)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 24 Sep 2014 12:07:55 +0000 (14:07 +0200)
Commit 346874c9507a ("KVM: x86: Fix CR3 reserved bits") removed non-PAE
reserved bits which were not according to Intel SDM.  However, residue was left
in a debug assertion (CR3_NONPAE_RESERVED_BITS).  Remove it.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/paging_tmpl.h

index 0ab6c65a28215c227c2a666aaea7d0e0b353ebc2..806d58e3c320ae8d7f703bb745cd988c73c07b77 100644 (file)
@@ -298,8 +298,7 @@ retry_walk:
        }
 #endif
        walker->max_level = walker->level;
-       ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
-              (mmu->get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
+       ASSERT(!is_long_mode(vcpu) && is_pae(vcpu));
 
        accessed_dirty = PT_GUEST_ACCESSED_MASK;
        pt_access = pte_access = ACC_ALL;