memblock/microblaze: Use new accessors

CC: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5b385f25
...@@ -70,16 +70,16 @@ static void __init paging_init(void) ...@@ -70,16 +70,16 @@ static void __init paging_init(void)
void __init setup_memory(void) void __init setup_memory(void)
{ {
int i;
unsigned long map_size; unsigned long map_size;
struct memblock_region *reg;
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
u32 kernel_align_start, kernel_align_size; u32 kernel_align_start, kernel_align_size;
/* Find main memory where is the kernel */ /* Find main memory where is the kernel */
for (i = 0; i < memblock.memory.cnt; i++) { for_each_memblock(memory, reg) {
memory_start = (u32) memblock.memory.regions[i].base; memory_start = (u32)reg->base;
memory_end = (u32) memblock.memory.regions[i].base memory_end = (u32) reg->base + reg->size;
+ (u32) memblock.memory.region[i].size;
if ((memory_start <= (u32)_text) && if ((memory_start <= (u32)_text) &&
((u32)_text <= memory_end)) { ((u32)_text <= memory_end)) {
memory_size = memory_end - memory_start; memory_size = memory_end - memory_start;
...@@ -147,12 +147,10 @@ void __init setup_memory(void) ...@@ -147,12 +147,10 @@ void __init setup_memory(void)
free_bootmem(memory_start, memory_size); free_bootmem(memory_start, memory_size);
/* reserve allocate blocks */ /* reserve allocate blocks */
for (i = 0; i < memblock.reserved.cnt; i++) { for_each_memblock(reserved, reg) {
pr_debug("reserved %d - 0x%08x-0x%08x\n", i, pr_debug("reserved - 0x%08x-0x%08x\n",
(u32) memblock.reserved.region[i].base, (u32) reg->base, (u32) reg->size);
(u32) memblock_size_bytes(&memblock.reserved, i)); reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
reserve_bootmem(memblock.reserved.region[i].base,
memblock_size_bytes(&memblock.reserved, i) - 1, BOOTMEM_DEFAULT);
} }
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
init_bootmem_done = 1; init_bootmem_done = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment