mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

memblock/sparc: Use new accessors

Browse source 
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2010-08-04 13:43:31 +10:00
parent 64106ca61c
commit 08b8479881
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
arch/sparc/mm/init_64.c
View file

@ -972,13 +972,13 @@ int of_node_to_nid(struct device_node *dp)
static void __init add_node_ranges(void) static void __init add_node_ranges(void)
{ {
int i; struct memblock_region *reg;
for (i = 0; i < memblock.memory.cnt; i++) { for_each_memblock(memory, reg) {
unsigned long size = memblock_size_bytes(&memblock.memory, i); unsigned long size = reg->size;
unsigned long start, end; unsigned long start, end;
start = memblock.memory.regions[i].base; start = reg->base;
end = start + size; end = start + size;
while (start < end) { while (start < end) {
unsigned long this_end; unsigned long this_end;
@ -1281,7 +1281,7 @@ static void __init bootmem_init_nonnuma(void)
{ {
unsigned long top_of_ram = memblock_end_of_DRAM(); unsigned long top_of_ram = memblock_end_of_DRAM();
unsigned long total_ram = memblock_phys_mem_size(); unsigned long total_ram = memblock_phys_mem_size();
unsigned int i; struct memblock_region *reg;
numadbg("bootmem_init_nonnuma()\n"); numadbg("bootmem_init_nonnuma()\n");
@ -1292,15 +1292,14 @@ static void __init bootmem_init_nonnuma(void)
init_node_masks_nonnuma(); init_node_masks_nonnuma();
for (i = 0; i < memblock.memory.cnt; i++) { for_each_memblock(memory, reg) {
unsigned long size = memblock_size_bytes(&memblock.memory, i);
unsigned long start_pfn, end_pfn; unsigned long start_pfn, end_pfn;
if (!size) if (!reg->size)
continue; continue;
start_pfn = memblock.memory.regions[i].base >> PAGE_SHIFT; start_pfn = memblock_region_base_pfn(reg);
end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i); end_pfn = memblock_region_end_pfn(reg);
add_active_range(0, start_pfn, end_pfn); add_active_range(0, start_pfn, end_pfn);
} }
@ -1334,17 +1333,12 @@ static void __init reserve_range_in_node(int nid, unsigned long start,
static void __init trim_reserved_in_node(int nid) static void __init trim_reserved_in_node(int nid)
{ {
int i; struct memblock_region *reg;
numadbg(" trim_reserved_in_node(%d)\n", nid); numadbg(" trim_reserved_in_node(%d)\n", nid);
for (i = 0; i < memblock.reserved.cnt; i++) { for_each_memblock(reserved, reg)
unsigned long start = memblock.reserved.regions[i].base; reserve_range_in_node(nid, reg->base, reg->base + reg->size);
unsigned long size = memblock_size_bytes(&memblock.reserved, i);
unsigned long end = start + size;
reserve_range_in_node(nid, start, end);
}
} }
static void __init bootmem_init_one_node(int nid) static void __init bootmem_init_one_node(int nid)