diff options
-rw-r--r-- | arch/arm/include/asm/kvm_arm.h | 1 | ||||
-rw-r--r-- | arch/arm/kvm/mmu.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/include/asm/kvm_arm.h b/arch/arm/include/asm/kvm_arm.h index 124623e5ef14..64e96960de29 100644 --- a/arch/arm/include/asm/kvm_arm.h +++ b/arch/arm/include/asm/kvm_arm.h | |||
@@ -135,7 +135,6 @@ | |||
135 | #define KVM_PHYS_MASK (KVM_PHYS_SIZE - 1ULL) | 135 | #define KVM_PHYS_MASK (KVM_PHYS_SIZE - 1ULL) |
136 | #define PTRS_PER_S2_PGD (1ULL << (KVM_PHYS_SHIFT - 30)) | 136 | #define PTRS_PER_S2_PGD (1ULL << (KVM_PHYS_SHIFT - 30)) |
137 | #define S2_PGD_ORDER get_order(PTRS_PER_S2_PGD * sizeof(pgd_t)) | 137 | #define S2_PGD_ORDER get_order(PTRS_PER_S2_PGD * sizeof(pgd_t)) |
138 | #define S2_PGD_SIZE (1 << S2_PGD_ORDER) | ||
139 | 138 | ||
140 | /* Virtualization Translation Control Register (VTCR) bits */ | 139 | /* Virtualization Translation Control Register (VTCR) bits */ |
141 | #define VTCR_SH0 (3 << 12) | 140 | #define VTCR_SH0 (3 << 12) |
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 965706578f13..5385462d693a 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c | |||
@@ -370,9 +370,6 @@ int kvm_alloc_stage2_pgd(struct kvm *kvm) | |||
370 | if (!pgd) | 370 | if (!pgd) |
371 | return -ENOMEM; | 371 | return -ENOMEM; |
372 | 372 | ||
373 | /* stage-2 pgd must be aligned to its size */ | ||
374 | VM_BUG_ON((unsigned long)pgd & (S2_PGD_SIZE - 1)); | ||
375 | |||
376 | memset(pgd, 0, PTRS_PER_S2_PGD * sizeof(pgd_t)); | 373 | memset(pgd, 0, PTRS_PER_S2_PGD * sizeof(pgd_t)); |
377 | kvm_clean_pgd(pgd); | 374 | kvm_clean_pgd(pgd); |
378 | kvm->arch.pgd = pgd; | 375 | kvm->arch.pgd = pgd; |