[PATCH 06/16] debug_vm_pgtable/THP: Mark the pte entry huge before using set_pmd_at

[Aneesh Kumar K.V]

kernel expect entries to be marked huge before we use set_pmd_at().

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
---
 mm/debug_vm_pgtable.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
index de8a62d0a931..b6aca2526e01 100644
--- a/mm/debug_vm_pgtable.c
+++ b/mm/debug_vm_pgtable.c
@@ -149,7 +149,7 @@ static void __init pmd_advanced_tests(struct mm_struct *mm,
                                      unsigned long pfn, unsigned long vaddr,
                                      pgprot_t prot)
 {
-       pmd_t pmd = pfn_pmd(pfn, prot);
+       pmd_t pmd;
 
        if (!has_transparent_hugepage())
                return;
@@ -158,19 +158,19 @@ static void __init pmd_advanced_tests(struct mm_struct 
*mm,
        /* Align the address wrt HPAGE_PMD_SIZE */
        vaddr = (vaddr & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE;
 
-       pmd = pfn_pmd(pfn, prot);
+       pmd = pmd_mkhuge(pfn_pmd(pfn, prot));
        set_pmd_at(mm, vaddr, pmdp, pmd);
        pmdp_set_wrprotect(mm, vaddr, pmdp);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(pmd_write(pmd));
 
-       pmd = pfn_pmd(pfn, prot);
+       pmd = pmd_mkhuge(pfn_pmd(pfn, prot));
        set_pmd_at(mm, vaddr, pmdp, pmd);
        pmdp_huge_get_and_clear(mm, vaddr, pmdp);
        pmd = READ_ONCE(*pmdp);
        WARN_ON(!pmd_none(pmd));
 
-       pmd = pfn_pmd(pfn, prot);
+       pmd = pmd_mkhuge(pfn_pmd(pfn, prot));
        pmd = pmd_wrprotect(pmd);
        pmd = pmd_mkclean(pmd);
        set_pmd_at(mm, vaddr, pmdp, pmd);
-- 
2.26.2