Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d86bb0da authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86: convert init_64.c from round_up to roundup 



Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 15ae2d76

arch/x86/mm/init_64.c

+4 −4
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void __init init_extra_mapping_uc(unsigned long phys, unsigned long size) 
void __init cleanup_highmap(void)

{

	unsigned long vaddr = __START_KERNEL_map;

	unsigned long end = round_up((unsigned long)_end, PMD_SIZE) - 1;

	unsigned long end = roundup((unsigned long)_end, PMD_SIZE) - 1;

	pmd_t *pmd = level2_kernel_pgt;

	pmd_t *last_pmd = pmd + PTRS_PER_PMD;
@@ -474,14 +474,14 @@ static void __init find_early_table_space(unsigned long end) 
	unsigned long puds, pmds, ptes, tables, start;



	puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;

	tables = round_up(puds * sizeof(pud_t), PAGE_SIZE);

	tables = roundup(puds * sizeof(pud_t), PAGE_SIZE);

	if (direct_gbpages) {

		unsigned long extra;

		extra = end - ((end>>PUD_SHIFT) << PUD_SHIFT);

		pmds = (extra + PMD_SIZE - 1) >> PMD_SHIFT;

	} else

		pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;

	tables += round_up(pmds * sizeof(pmd_t), PAGE_SIZE);

	tables += roundup(pmds * sizeof(pmd_t), PAGE_SIZE);



	if (cpu_has_pse) {

		unsigned long extra;
@@ -489,7 +489,7 @@ static void __init find_early_table_space(unsigned long end) 
		ptes = (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;

	} else

		ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT;

	tables += round_up(ptes * sizeof(pte_t), PAGE_SIZE);

	tables += roundup(ptes * sizeof(pte_t), PAGE_SIZE);



	/*

	 * RED-PEN putting page tables only on node 0 could