|
@@ -1,6 +1,7 @@
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
#include <linux/mm.h>
|
|
|
#include <linux/gfp.h>
|
|
|
+#include <linux/hugetlb.h>
|
|
|
#include <asm/pgalloc.h>
|
|
|
#include <asm/pgtable.h>
|
|
|
#include <asm/tlb.h>
|
|
@@ -639,6 +640,10 @@ int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot)
|
|
|
(mtrr != MTRR_TYPE_WRBACK))
|
|
|
return 0;
|
|
|
|
|
|
+ /* Bail out if we are we on a populated non-leaf entry: */
|
|
|
+ if (pud_present(*pud) && !pud_huge(*pud))
|
|
|
+ return 0;
|
|
|
+
|
|
|
prot = pgprot_4k_2_large(prot);
|
|
|
|
|
|
set_pte((pte_t *)pud, pfn_pte(
|
|
@@ -667,6 +672,10 @@ int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+ /* Bail out if we are we on a populated non-leaf entry: */
|
|
|
+ if (pmd_present(*pmd) && !pmd_huge(*pmd))
|
|
|
+ return 0;
|
|
|
+
|
|
|
prot = pgprot_4k_2_large(prot);
|
|
|
|
|
|
set_pte((pte_t *)pmd, pfn_pte(
|