summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/mm
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 14:06:41 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 14:21:49 +1000
commite3239ff92a17976ac5d26fa0fe40ef3a9daf2523 (patch)
treeda3c493196811ccae1b79c3c94234f5d481c8221 /arch/microblaze/mm
parentf1c2c19c498e27de48bf0dc4221e6e31b1823169 (diff)
downloadop-kernel-dev-e3239ff92a17976ac5d26fa0fe40ef3a9daf2523.zip
op-kernel-dev-e3239ff92a17976ac5d26fa0fe40ef3a9daf2523.tar.gz
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/mm')
-rw-r--r--arch/microblaze/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index db59349..afd6494 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)) {
OpenPOWER on IntegriCloud