diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 06:06:41 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 06:21:49 +0200 |
| commit | e3239ff92a17976ac5d26fa0fe40ef3a9daf2523 (patch) | |
| tree | da3c493196811ccae1b79c3c94234f5d481c8221 /arch/microblaze | |
| parent | memblock: Fix memblock_is_region_reserved() to return a boolean (diff) | |
| download | linux-e3239ff92a17976ac5d26fa0fe40ef3a9daf2523.tar.xz linux-e3239ff92a17976ac5d26fa0fe40ef3a9daf2523.zip | |
memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index db5934989926..afd6494fbbc6 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -77,8 +77,8 @@ void __init setup_memory(void) /* Find main memory where is the kernel */ for (i = 0; i < memblock.memory.cnt; i++) { - memory_start = (u32) memblock.memory.region[i].base; - memory_end = (u32) memblock.memory.region[i].base + memory_start = (u32) memblock.memory.regions[i].base; + memory_end = (u32) memblock.memory.regions[i].base + (u32) memblock.memory.region[i].size; if ((memory_start <= (u32)_text) && ((u32)_text <= memory_end)) { |