projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8d7c6fa)
dmaengine: ioat: depends on !UML
authorJohannes Berg <johannes.berg@intel.com>
Mon, 9 Aug 2021 09:24:09 +0000 (11:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Sep 2021 11:36:18 +0000 (13:36 +0200)
[ Upstream commit bbac7a92a46f0876e588722ebe552ddfe6fd790f ]

Now that UML has PCI support, this driver must depend also on
!UML since it pokes at X86_64 architecture internals that don't
exist on ARCH=um.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20210809112409.a3a0974874d2.I2ffe3d11ed37f735da2f39884a74c953b258b995@changeid
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/Kconfig patch | blob | blame | history

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index b0f798244a897512d76f71a00a5a653a0d12154d..9a6da9b2dad35ee76eff637d81b7562fb277cd53 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -238,7 +238,7 @@ config INTEL_IDMA64
 
 config INTEL_IOATDMA
        tristate "Intel I/OAT DMA support"
-       depends on PCI && X86_64
+       depends on PCI && X86_64 && !UML
        select DMA_ENGINE
        select DMA_ENGINE_RAID
        select DCA