|
@@ -91,7 +91,8 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
|
|
|
|
|
|
if (ioremap_pmd_enabled() &&
|
|
|
((next - addr) == PMD_SIZE) &&
|
|
|
- IS_ALIGNED(phys_addr + addr, PMD_SIZE)) {
|
|
|
+ IS_ALIGNED(phys_addr + addr, PMD_SIZE) &&
|
|
|
+ pmd_free_pte_page(pmd)) {
|
|
|
if (pmd_set_huge(pmd, phys_addr + addr, prot))
|
|
|
continue;
|
|
|
}
|
|
@@ -117,7 +118,8 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr,
|
|
|
|
|
|
if (ioremap_pud_enabled() &&
|
|
|
((next - addr) == PUD_SIZE) &&
|
|
|
- IS_ALIGNED(phys_addr + addr, PUD_SIZE)) {
|
|
|
+ IS_ALIGNED(phys_addr + addr, PUD_SIZE) &&
|
|
|
+ pud_free_pmd_page(pud)) {
|
|
|
if (pud_set_huge(pud, phys_addr + addr, prot))
|
|
|
continue;
|
|
|
}
|