Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1715d0dcb0d4231983f1580e265c748cd3371f55

Authored by Nadav Amit
Committed by Paolo Bonzini
1 parent 3d32e4dbe7
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

KVM: x86: Wrong assertion on paging_tmpl.h 

Even after the recent fix, the assertion on paging_tmpl.h is triggered.
Apparently, the assertion wants to check that the PAE is always set on
long-mode, but does it in incorrect way.  Note that the assertion is not
enabled unless the code is debugged by defining MMU_DEBUG.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/x86/kvm/paging_tmpl.h
Diff comments   View file @ 1715d0d
... ... @@ -298,7 +298,7 @@
298 298 }
299 299 #endif
300 300 walker->max_level = walker->level;
301   - ASSERT(!is_long_mode(vcpu) && is_pae(vcpu));
  301 + ASSERT(!(is_long_mode(vcpu) && !is_pae(vcpu)));
302 302  
303 303 accessed_dirty = PT_GUEST_ACCESSED_MASK;
304 304 pt_access = pte_access = ACC_ALL;