Messages in this thread Patch in this message |  | | From | Yinghai Lu <> | Subject | [PATCH v6 02/27] x86, mm: make pgd next calculation consistent with pud/pmd | Date | Thu, 13 Dec 2012 14:01:56 -0800 |
| |
Just like PUD_SIZE, and PMD_SIZE next calculation, aka round down and add size.
also remove not need next checking, just pass end instead. later phys_pud_init uses PTRS_PER_PUD checking to exit early if end is too big.
Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/mm/init_64.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 4178530..91f116a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -530,9 +530,7 @@ kernel_physical_mapping_init(unsigned long start, pgd_t *pgd = pgd_offset_k(start); pud_t *pud; - next = (start + PGDIR_SIZE) & PGDIR_MASK; - if (next > end) - next = end; + next = (start & PGDIR_MASK) + PGDIR_SIZE; if (pgd_val(*pgd)) { pud = (pud_t *)pgd_page_vaddr(*pgd); @@ -542,7 +540,7 @@ kernel_physical_mapping_init(unsigned long start, } pud = alloc_low_page(); - last_map_addr = phys_pud_init(pud, __pa(start), __pa(next), + last_map_addr = phys_pud_init(pud, __pa(start), __pa(end), page_size_mask); spin_lock(&init_mm.page_table_lock); -- 1.7.10.4
|  |