diff options
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 594d677b92c8..4fa9c246ae93 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -554,6 +554,8 @@ static void __init alloc_init_section(pud_t *pud, unsigned long addr, const struct mem_type *type) { pmd_t *pmd = pmd_offset(pud, addr); + unsigned long pages_2m = 0, pages_4k = 0; + unsigned long stash_phys = phys; /* * Try a section mapping - end, addr and phys must all be aligned @@ -564,6 +566,8 @@ static void __init alloc_init_section(pud_t *pud, unsigned long addr, if (((addr | end | phys) & ~SECTION_MASK) == 0) { pmd_t *p = pmd; + pages_2m = (end - addr) >> (PGDIR_SHIFT); + if (addr & SECTION_SIZE) pmd++; @@ -574,12 +578,18 @@ static void __init alloc_init_section(pud_t *pud, unsigned long addr, flush_pmd_entry(p); } else { + pages_4k = (end - addr) >> PAGE_SHIFT; /* * No need to loop; pte's aren't interested in the * individual L1 entries. */ alloc_init_pte(pmd, addr, end, __phys_to_pfn(phys), type); } + + if ((stash_phys >= PHYS_OFFSET) && (stash_phys < lowmem_limit)) { + update_page_count(PG_LEVEL_2M, pages_2m); + update_page_count(PG_LEVEL_4K, pages_4k); + } } static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end, @@ -757,7 +767,7 @@ static int __init early_vmalloc(char *arg) } early_param("vmalloc", early_vmalloc); -static phys_addr_t lowmem_limit __initdata = 0; +phys_addr_t lowmem_limit; void __init sanity_check_meminfo(void) { |