diff options
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index ad7a477f3423..cfb119e4c4d1 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -337,9 +337,9 @@ phys_pte_init(pte_t *pte_page, unsigned long paddr, unsigned long paddr_end, paddr_next = (paddr & PAGE_MASK) + PAGE_SIZE; if (paddr >= paddr_end) { if (!after_bootmem && - !e820_any_mapped(paddr & PAGE_MASK, paddr_next, + !e820__mapped_any(paddr & PAGE_MASK, paddr_next, E820_RAM) && - !e820_any_mapped(paddr & PAGE_MASK, paddr_next, + !e820__mapped_any(paddr & PAGE_MASK, paddr_next, E820_RESERVED_KERN)) set_pte(pte, __pte(0)); continue; @@ -392,9 +392,9 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end, paddr_next = (paddr & PMD_MASK) + PMD_SIZE; if (paddr >= paddr_end) { if (!after_bootmem && - !e820_any_mapped(paddr & PMD_MASK, paddr_next, + !e820__mapped_any(paddr & PMD_MASK, paddr_next, E820_RAM) && - !e820_any_mapped(paddr & PMD_MASK, paddr_next, + !e820__mapped_any(paddr & PMD_MASK, paddr_next, E820_RESERVED_KERN)) set_pmd(pmd, __pmd(0)); continue; @@ -478,9 +478,9 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end, if (paddr >= paddr_end) { if (!after_bootmem && - !e820_any_mapped(paddr & PUD_MASK, paddr_next, + !e820__mapped_any(paddr & PUD_MASK, paddr_next, E820_RAM) && - !e820_any_mapped(paddr & PUD_MASK, paddr_next, + !e820__mapped_any(paddr & PUD_MASK, paddr_next, E820_RESERVED_KERN)) set_pud(pud, __pud(0)); continue; |