Skip to content

Commit 3657190

Browse files
jmberg-intelrichardweinberger
authored andcommitted
um: Use asm-generic/dma-mapping.h
If DMA (PCI over virtio) is enabled, then some drivers may enable CONFIG_DMA_OPS as well, and then we pull in the x86 definition of get_arch_dma_ops(), which uses the dma_ops symbol, which isn't defined. Since we don't have real DMA ops nor any kind of IOMMU fix this in the simplest possible way: pull in the asm-generic file instead of inheriting the x86 one. It's not clear why those drivers that do (e.g. VDPA) "select DMA_OPS", and if they'd even work with this, but chances are nobody will be wanting to do that anyway, so fixing the build failure is good enough. Reported-by: Randy Dunlap <[email protected]> Fixes: 68f5d3f ("um: add PCI over virtio emulation driver") Signed-off-by: Johannes Berg <[email protected]> Tested-by: Randy Dunlap <[email protected]> Acked-by: Randy Dunlap <[email protected]> Cc: [email protected] Signed-off-by: Richard Weinberger <[email protected]>
1 parent b0cbccf commit 3657190

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/um/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ generic-y += bug.h
44
generic-y += compat.h
55
generic-y += current.h
66
generic-y += device.h
7+
generic-y += dma-mapping.h
78
generic-y += emergency-restart.h
89
generic-y += exec.h
910
generic-y += extable.h

0 commit comments

Comments
 (0)