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

Commit 7c927322 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Russell King
Browse files

ARM: 7909/1: mm: Call setup_dma_zone() post early_paging_init() 



To get updated __pv_phys_offset, setup_dma_zone() needs to be
called after early_paging_init().

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 787b0d5c

arch/arm/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -873,8 +873,6 @@ void __init setup_arch(char **cmdline_p) 
	machine_desc = mdesc;

	machine_name = mdesc->name;



	setup_dma_zone(mdesc);



	if (mdesc->reboot_mode != REBOOT_HARD)

		reboot_mode = mdesc->reboot_mode;
@@ -892,6 +890,7 @@ void __init setup_arch(char **cmdline_p) 
	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);



	early_paging_init(mdesc, lookup_processor_type(read_cpuid_id()));

	setup_dma_zone(mdesc);

	sanity_check_meminfo();

	arm_memblock_init(&meminfo, mdesc);