|
@@ -79,7 +79,7 @@ static int __init allocate_cachealigned_memnodemap(void)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
addr = 0x8000;
|
|
addr = 0x8000;
|
|
- nodemap_size = round_up(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);
|
|
|
|
|
|
+ nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);
|
|
nodemap_addr = find_e820_area(addr, max_pfn<<PAGE_SHIFT,
|
|
nodemap_addr = find_e820_area(addr, max_pfn<<PAGE_SHIFT,
|
|
nodemap_size, L1_CACHE_BYTES);
|
|
nodemap_size, L1_CACHE_BYTES);
|
|
if (nodemap_addr == -1UL) {
|
|
if (nodemap_addr == -1UL) {
|
|
@@ -176,10 +176,10 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
|
|
unsigned long start_pfn, last_pfn, bootmap_pages, bootmap_size;
|
|
unsigned long start_pfn, last_pfn, bootmap_pages, bootmap_size;
|
|
unsigned long bootmap_start, nodedata_phys;
|
|
unsigned long bootmap_start, nodedata_phys;
|
|
void *bootmap;
|
|
void *bootmap;
|
|
- const int pgdat_size = round_up(sizeof(pg_data_t), PAGE_SIZE);
|
|
|
|
|
|
+ const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
|
|
int nid;
|
|
int nid;
|
|
|
|
|
|
- start = round_up(start, ZONE_ALIGN);
|
|
|
|
|
|
+ start = roundup(start, ZONE_ALIGN);
|
|
|
|
|
|
printk(KERN_INFO "Bootmem setup node %d %016lx-%016lx\n", nodeid,
|
|
printk(KERN_INFO "Bootmem setup node %d %016lx-%016lx\n", nodeid,
|
|
start, end);
|
|
start, end);
|
|
@@ -210,9 +210,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
|
|
bootmap_pages = bootmem_bootmap_pages(last_pfn - start_pfn);
|
|
bootmap_pages = bootmem_bootmap_pages(last_pfn - start_pfn);
|
|
nid = phys_to_nid(nodedata_phys);
|
|
nid = phys_to_nid(nodedata_phys);
|
|
if (nid == nodeid)
|
|
if (nid == nodeid)
|
|
- bootmap_start = round_up(nodedata_phys + pgdat_size, PAGE_SIZE);
|
|
|
|
|
|
+ bootmap_start = roundup(nodedata_phys + pgdat_size, PAGE_SIZE);
|
|
else
|
|
else
|
|
- bootmap_start = round_up(start, PAGE_SIZE);
|
|
|
|
|
|
+ bootmap_start = roundup(start, PAGE_SIZE);
|
|
/*
|
|
/*
|
|
* SMP_CACHE_BYTES could be enough, but init_bootmem_node like
|
|
* SMP_CACHE_BYTES could be enough, but init_bootmem_node like
|
|
* to use that to align to PAGE_SIZE
|
|
* to use that to align to PAGE_SIZE
|