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

Commit 1d3ac26f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Disable ZONE_DMA32 on Lahaina"

parents 28e2a94b 27b873ce

arch/arm64/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -260,7 +260,10 @@ config GENERIC_CALIBRATE_DELAY 
	def_bool y



config ZONE_DMA32

	def_bool y

	bool "Enable or Disable Zone DMA"

	default y

	help

	  This option enables/disables the DMA zone.



config HAVE_GENERIC_GUP

	def_bool y

arch/arm64/configs/vendor/lahaina_QGKI.config

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ CONFIG_IOMMU_DEBUG=y 
CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

CONFIG_QCOM_SECURE_BUFFER=y

# CONFIG_ZONE_DMA32 is not set

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ config QCOM_IOMMU_IO_PGTABLE_QUIRKS 
	  saved in the system cache, and disabling the write-allocate

	  hint when saving page tables in the system cache.



	  If unsure, say Y here.

	  If unsure, say N here.



endmenu