Commit 6d073dad authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by Linus Torvalds
Browse files

ia64: simplify code flow around swiotlb init 

Before the change CONFIG_INTEL_IOMMU && !CONFIG_SWIOTLB && !CONFIG_FLATMEM
could skip `set_max_mapnr(max_low_pfn);` if iommu is not present on
system.

Link: https://lkml.kernel.org/r/20210328202439.403601-1-slyfox@gentoo.org


Signed-off-by: default avatarSergei Trofimovich <slyfox@gentoo.org>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d732f47d

arch/ia64/mm/init.c

+5 −2
Original line number Diff line number Diff line
@@ -644,13 +644,16 @@ mem_init (void) 
	 * _before_ any drivers that may need the PCI DMA interface are

	 * initialized or bootmem has been freed.

	 */

	do {

#ifdef CONFIG_INTEL_IOMMU

		detect_intel_iommu();

	if (!iommu_detected)

		if (iommu_detected)

			break;

#endif

#ifdef CONFIG_SWIOTLB

		swiotlb_init(1);

#endif

	} while (0);



#ifdef CONFIG_FLATMEM

	BUG_ON(!mem_map);