|
@@ -228,7 +228,7 @@ static void mm_cmdline_setup(void)
|
|
|
if (maxmem && memory_size > maxmem) {
|
|
|
memory_size = maxmem;
|
|
|
memory_end = memory_start + memory_size;
|
|
|
- memblock.memory.region[0].size = memory_size;
|
|
|
+ memblock.memory.regions[0].size = memory_size;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -271,14 +271,14 @@ asmlinkage void __init mmu_init(void)
|
|
|
machine_restart(NULL);
|
|
|
}
|
|
|
|
|
|
- if ((u32) memblock.memory.region[0].size < 0x1000000) {
|
|
|
+ if ((u32) memblock.memory.regions[0].size < 0x1000000) {
|
|
|
printk(KERN_EMERG "Memory must be greater than 16MB\n");
|
|
|
machine_restart(NULL);
|
|
|
}
|
|
|
/* Find main memory where the kernel is */
|
|
|
- memory_start = (u32) memblock.memory.region[0].base;
|
|
|
- memory_end = (u32) memblock.memory.region[0].base +
|
|
|
- (u32) memblock.memory.region[0].size;
|
|
|
+ memory_start = (u32) memblock.memory.regions[0].base;
|
|
|
+ memory_end = (u32) memblock.memory.regions[0].base +
|
|
|
+ (u32) memblock.memory.regions[0].size;
|
|
|
memory_size = memory_end - memory_start;
|
|
|
|
|
|
mm_cmdline_setup(); /* FIXME parse args from command line - not used */
|