diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/mm/init_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index f0434513df15..16d8bee889ba 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -978,7 +978,7 @@ static void __init add_node_ranges(void) | |||
978 | unsigned long size = memblock_size_bytes(&memblock.memory, i); | 978 | unsigned long size = memblock_size_bytes(&memblock.memory, i); |
979 | unsigned long start, end; | 979 | unsigned long start, end; |
980 | 980 | ||
981 | start = memblock.memory.region[i].base; | 981 | start = memblock.memory.regions[i].base; |
982 | end = start + size; | 982 | end = start + size; |
983 | while (start < end) { | 983 | while (start < end) { |
984 | unsigned long this_end; | 984 | unsigned long this_end; |
@@ -1299,7 +1299,7 @@ static void __init bootmem_init_nonnuma(void) | |||
1299 | if (!size) | 1299 | if (!size) |
1300 | continue; | 1300 | continue; |
1301 | 1301 | ||
1302 | start_pfn = memblock.memory.region[i].base >> PAGE_SHIFT; | 1302 | start_pfn = memblock.memory.regions[i].base >> PAGE_SHIFT; |
1303 | end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i); | 1303 | end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i); |
1304 | add_active_range(0, start_pfn, end_pfn); | 1304 | add_active_range(0, start_pfn, end_pfn); |
1305 | } | 1305 | } |
@@ -1339,7 +1339,7 @@ static void __init trim_reserved_in_node(int nid) | |||
1339 | numadbg(" trim_reserved_in_node(%d)\n", nid); | 1339 | numadbg(" trim_reserved_in_node(%d)\n", nid); |
1340 | 1340 | ||
1341 | for (i = 0; i < memblock.reserved.cnt; i++) { | 1341 | for (i = 0; i < memblock.reserved.cnt; i++) { |
1342 | unsigned long start = memblock.reserved.region[i].base; | 1342 | unsigned long start = memblock.reserved.regions[i].base; |
1343 | unsigned long size = memblock_size_bytes(&memblock.reserved, i); | 1343 | unsigned long size = memblock_size_bytes(&memblock.reserved, i); |
1344 | unsigned long end = start + size; | 1344 | unsigned long end = start + size; |
1345 | 1345 | ||