diff options
author | Suzuki K Poulose <suzuki.poulose@arm.com> | 2016-03-22 10:06:47 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-04-21 08:57:15 -0400 |
commit | 77b5665141a9a7e69d2f685ee2f2a3698fd27397 (patch) | |
tree | 6c4efcb4ce319c2539aa9e009737f895fef222b6 /arch/arm/kvm | |
parent | bbb3b6b35087539e75792b46e07b7ce5282d0979 (diff) |
kvm-arm: Remove kvm_pud_huge()
Get rid of kvm_pud_huge() which falls back to pud_huge. Use
pud_huge instead.
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r-- | arch/arm/kvm/mmu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 7837f0afa5a4..d0c0ee92c378 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c | |||
@@ -45,8 +45,6 @@ static phys_addr_t hyp_idmap_vector; | |||
45 | 45 | ||
46 | #define hyp_pgd_order get_order(PTRS_PER_PGD * sizeof(pgd_t)) | 46 | #define hyp_pgd_order get_order(PTRS_PER_PGD * sizeof(pgd_t)) |
47 | 47 | ||
48 | #define kvm_pud_huge(_x) pud_huge(_x) | ||
49 | |||
50 | #define KVM_S2PTE_FLAG_IS_IOMAP (1UL << 0) | 48 | #define KVM_S2PTE_FLAG_IS_IOMAP (1UL << 0) |
51 | #define KVM_S2_FLAG_LOGGING_ACTIVE (1UL << 1) | 49 | #define KVM_S2_FLAG_LOGGING_ACTIVE (1UL << 1) |
52 | 50 | ||
@@ -1077,7 +1075,7 @@ static void stage2_wp_puds(pgd_t *pgd, phys_addr_t addr, phys_addr_t end) | |||
1077 | next = kvm_pud_addr_end(addr, end); | 1075 | next = kvm_pud_addr_end(addr, end); |
1078 | if (!pud_none(*pud)) { | 1076 | if (!pud_none(*pud)) { |
1079 | /* TODO:PUD not supported, revisit later if supported */ | 1077 | /* TODO:PUD not supported, revisit later if supported */ |
1080 | BUG_ON(kvm_pud_huge(*pud)); | 1078 | BUG_ON(pud_huge(*pud)); |
1081 | stage2_wp_pmds(pud, addr, next); | 1079 | stage2_wp_pmds(pud, addr, next); |
1082 | } | 1080 | } |
1083 | } while (pud++, addr = next, addr != end); | 1081 | } while (pud++, addr = next, addr != end); |