diff options
Diffstat (limited to 'drivers/kvm/paging_tmpl.h')
-rw-r--r-- | drivers/kvm/paging_tmpl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h index a9771b4c5bb8..09bb9b4ed12d 100644 --- a/drivers/kvm/paging_tmpl.h +++ b/drivers/kvm/paging_tmpl.h | |||
@@ -68,7 +68,7 @@ static void FNAME(init_walker)(struct guest_walker *walker, | |||
68 | hpa = safe_gpa_to_hpa(vcpu, vcpu->cr3 & PT64_BASE_ADDR_MASK); | 68 | hpa = safe_gpa_to_hpa(vcpu, vcpu->cr3 & PT64_BASE_ADDR_MASK); |
69 | walker->table = kmap_atomic(pfn_to_page(hpa >> PAGE_SHIFT), KM_USER0); | 69 | walker->table = kmap_atomic(pfn_to_page(hpa >> PAGE_SHIFT), KM_USER0); |
70 | 70 | ||
71 | ASSERT((!kvm_arch_ops->is_long_mode(vcpu) && is_pae(vcpu)) || | 71 | ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) || |
72 | (vcpu->cr3 & ~(PAGE_MASK | CR3_FLAGS_MASK)) == 0); | 72 | (vcpu->cr3 & ~(PAGE_MASK | CR3_FLAGS_MASK)) == 0); |
73 | 73 | ||
74 | walker->table = (pt_element_t *)( (unsigned long)walker->table | | 74 | walker->table = (pt_element_t *)( (unsigned long)walker->table | |
@@ -131,7 +131,7 @@ static pt_element_t *FNAME(fetch_guest)(struct kvm_vcpu *vcpu, | |||
131 | (walker->table[index] & PT_PAGE_SIZE_MASK) && | 131 | (walker->table[index] & PT_PAGE_SIZE_MASK) && |
132 | (PTTYPE == 64 || is_pse(vcpu)))) | 132 | (PTTYPE == 64 || is_pse(vcpu)))) |
133 | return &walker->table[index]; | 133 | return &walker->table[index]; |
134 | if (walker->level != 3 || kvm_arch_ops->is_long_mode(vcpu)) | 134 | if (walker->level != 3 || is_long_mode(vcpu)) |
135 | walker->inherited_ar &= walker->table[index]; | 135 | walker->inherited_ar &= walker->table[index]; |
136 | paddr = safe_gpa_to_hpa(vcpu, walker->table[index] & PT_BASE_ADDR_MASK); | 136 | paddr = safe_gpa_to_hpa(vcpu, walker->table[index] & PT_BASE_ADDR_MASK); |
137 | kunmap_atomic(walker->table, KM_USER0); | 137 | kunmap_atomic(walker->table, KM_USER0); |