diff options
| author | Nadav Amit <namit@cs.technion.ac.il> | 2014-09-23 10:01:57 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-24 14:07:55 +0200 |
| commit | d5262739cbb8a6414ba521a79bf0549717459a09 (patch) | |
| tree | 62df87bbaca11fcf8e7ef8be7ec909ec7d75a811 /arch/x86 | |
| parent | 2ea75be3219571d0ec009ce20d9971e54af96e09 (diff) | |
| download | linux-d5262739cbb8a6414ba521a79bf0549717459a09.tar.gz linux-d5262739cbb8a6414ba521a79bf0549717459a09.tar.bz2 linux-d5262739cbb8a6414ba521a79bf0549717459a09.zip | |
KVM: x86: Remove debug assertion of non-PAE reserved bits
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 0ab6c65a2821..806d58e3c320 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -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; |