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

Commit 86a5906e authored by Robin Murphy's avatar Robin Murphy Committed by Catalin Marinas
Browse files

arm64: Fix build with CONFIG_ZONE_DMA=n 



Trying to build with CONFIG_ZONE_DMA=n leaves visible references
to the now-undefined ZONE_DMA, resulting in a syntax error.

Hide the references behind an #ifdef instead of using IS_ENABLED.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 5accd17d

arch/arm64/mm/init.c

+7 −6
Original line number Diff line number Diff line
@@ -86,10 +86,10 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) 
	memset(zone_size, 0, sizeof(zone_size));



	/* 4GB maximum for 32-bit only capable devices */

	if (IS_ENABLED(CONFIG_ZONE_DMA)) {

#ifdef CONFIG_ZONE_DMA

	max_dma = PFN_DOWN(arm64_dma_phys_limit);

	zone_size[ZONE_DMA] = max_dma - min;

	}

#endif

	zone_size[ZONE_NORMAL] = max - max_dma;



	memcpy(zhole_size, zone_size, sizeof(zhole_size));
@@ -101,11 +101,12 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) 
		if (start >= max)

			continue;



		if (IS_ENABLED(CONFIG_ZONE_DMA) && start < max_dma) {

#ifdef CONFIG_ZONE_DMA

		if (start < max_dma) {

			unsigned long dma_end = min(end, max_dma);

			zhole_size[ZONE_DMA] -= dma_end - start;

		}



#endif

		if (end > max_dma) {

			unsigned long normal_end = min(end, max);

			unsigned long normal_start = max(start, max_dma);