aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_64.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2008-07-25 10:48:57 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-26 09:39:21 -0400
commitd86bb0dac792c6a9c92944b6db2687980c808094 (patch)
tree02f3be28dc17a8fe6bc8a0795368dd5a32b426d7 /arch/x86/mm/init_64.c
parent15ae2d76ceb037a1e3fcd8fc9b4fe3177f9f3831 (diff)
x86: convert init_64.c from round_up to roundup
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r--arch/x86/mm/init_64.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index ec37121f6709..e4805771b5be 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -258,7 +258,7 @@ void __init init_extra_mapping_uc(unsigned long phys, unsigned long size)
258void __init cleanup_highmap(void) 258void __init cleanup_highmap(void)
259{ 259{
260 unsigned long vaddr = __START_KERNEL_map; 260 unsigned long vaddr = __START_KERNEL_map;
261 unsigned long end = round_up((unsigned long)_end, PMD_SIZE) - 1; 261 unsigned long end = roundup((unsigned long)_end, PMD_SIZE) - 1;
262 pmd_t *pmd = level2_kernel_pgt; 262 pmd_t *pmd = level2_kernel_pgt;
263 pmd_t *last_pmd = pmd + PTRS_PER_PMD; 263 pmd_t *last_pmd = pmd + PTRS_PER_PMD;
264 264
@@ -474,14 +474,14 @@ static void __init find_early_table_space(unsigned long end)
474 unsigned long puds, pmds, ptes, tables, start; 474 unsigned long puds, pmds, ptes, tables, start;
475 475
476 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT; 476 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
477 tables = round_up(puds * sizeof(pud_t), PAGE_SIZE); 477 tables = roundup(puds * sizeof(pud_t), PAGE_SIZE);
478 if (direct_gbpages) { 478 if (direct_gbpages) {
479 unsigned long extra; 479 unsigned long extra;
480 extra = end - ((end>>PUD_SHIFT) << PUD_SHIFT); 480 extra = end - ((end>>PUD_SHIFT) << PUD_SHIFT);
481 pmds = (extra + PMD_SIZE - 1) >> PMD_SHIFT; 481 pmds = (extra + PMD_SIZE - 1) >> PMD_SHIFT;
482 } else 482 } else
483 pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT; 483 pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
484 tables += round_up(pmds * sizeof(pmd_t), PAGE_SIZE); 484 tables += roundup(pmds * sizeof(pmd_t), PAGE_SIZE);
485 485
486 if (cpu_has_pse) { 486 if (cpu_has_pse) {
487 unsigned long extra; 487 unsigned long extra;
@@ -489,7 +489,7 @@ static void __init find_early_table_space(unsigned long end)
489 ptes = (extra + PAGE_SIZE - 1) >> PAGE_SHIFT; 489 ptes = (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
490 } else 490 } else
491 ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT; 491 ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT;
492 tables += round_up(ptes * sizeof(pte_t), PAGE_SIZE); 492 tables += roundup(ptes * sizeof(pte_t), PAGE_SIZE);
493 493
494 /* 494 /*
495 * RED-PEN putting page tables only on node 0 could 495 * RED-PEN putting page tables only on node 0 could