kvm-arm: Remove kvm_pud_huge()
authorSuzuki K Poulose <suzuki.poulose@arm.com>
Tue, 22 Mar 2016 14:06:47 +0000 (14:06 +0000)
committerChristoffer Dall <christoffer.dall@linaro.org>
Thu, 21 Apr 2016 12:57:15 +0000 (14:57 +0200)
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>
arch/arm/kvm/mmu.c

index 7837f0afa5a4d30fa6e7a40037264da04bb77c5d..d0c0ee92c378c2e4700e92b37f4c8e05195b5ea5 100644 (file)
@@ -45,8 +45,6 @@ static phys_addr_t hyp_idmap_vector;
 
 #define hyp_pgd_order get_order(PTRS_PER_PGD * sizeof(pgd_t))
 
-#define kvm_pud_huge(_x)       pud_huge(_x)
-
 #define KVM_S2PTE_FLAG_IS_IOMAP                (1UL << 0)
 #define KVM_S2_FLAG_LOGGING_ACTIVE     (1UL << 1)
 
@@ -1077,7 +1075,7 @@ static void  stage2_wp_puds(pgd_t *pgd, phys_addr_t addr, phys_addr_t end)
                next = kvm_pud_addr_end(addr, end);
                if (!pud_none(*pud)) {
                        /* TODO:PUD not supported, revisit later if supported */
-                       BUG_ON(kvm_pud_huge(*pud));
+                       BUG_ON(pud_huge(*pud));
                        stage2_wp_pmds(pud, addr, next);
                }
        } while (pud++, addr = next, addr != end);