ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier (9811ccdf) · Commits · 戴 / test

arm_dma_zone_size is used by arm_bootmem_free() which is called by paging_init(). Thus it needs to be set before calling it. Signed-off-by:

Nicolas Pitre <nico@linaro.org> Cc: stable@kernel.org Signed-off-by:

arch/arm/kernel/setup.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -902,6 +902,12 @@ void __init setup_arch(char **cmdline_p)
		machine_desc = mdesc;
		machine_name = mdesc->name;

		#ifdef CONFIG_ZONE_DMA
		if (mdesc->dma_zone_size) {
		extern unsigned long arm_dma_zone_size;
		arm_dma_zone_size = mdesc->dma_zone_size;
		}
		#endif
		if (mdesc->soft_reboot)
		reboot_setup("s");

		@@ -932,12 +938,6 @@ void __init setup_arch(char **cmdline_p)

		tcm_init();

		#ifdef CONFIG_ZONE_DMA
		if (mdesc->dma_zone_size) {
		extern unsigned long arm_dma_zone_size;
		arm_dma_zone_size = mdesc->dma_zone_size;
		}
		#endif
		#ifdef CONFIG_MULTI_IRQ_HANDLER
		handle_arch_irq = mdesc->handle_irq;
		#endif