Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da5ab11c authored by Michal Simek's avatar Michal Simek Committed by Ingo Molnar
Browse files

memblock, microblaze: Fix memblock API change fallout 



Adopt Microblaze to the memblock API changes, to fix this
build failure:

  CC      arch/microblaze/mm/init.o
 arch/microblaze/mm/init.c: In function 'mm_cmdline_setup':
 arch/microblaze/mm/init.c:236: error: 'struct memblock_type' has no member named 'region'
 ...

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: linux-mm@kvack.org
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
LKML-Reference: <4C8B2A9A.1040303@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent daab7fc7

arch/microblaze/mm/init.c

+5 −5
Original line number Diff line number Diff line
@@ -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 */