diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-05 02:29:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-05 02:29:57 +0200 |
| commit | 2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8 (patch) | |
| tree | 05bdc7c3d5164836b3a64016c79c90b6f21d2962 /arch/alpha | |
| parent | Merge tag 'uuid-for-5.9' of git://git.infradead.org/users/hch/uuid (diff) | |
| parent | dma-contiguous: cleanup dma_alloc_contiguous (diff) | |
| download | linux-2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8.tar.xz linux-2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8.zip | |
Merge tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- make support for dma_ops optional
- move more code out of line
- add generic support for a dma_ops bypass mode
- misc cleanups
* tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping:
dma-contiguous: cleanup dma_alloc_contiguous
dma-debug: use named initializers for dir2name
powerpc: use the generic dma_ops_bypass mode
dma-mapping: add a dma_ops_bypass flag to struct device
dma-mapping: make support for dma ops optional
dma-mapping: inline the fast path dma-direct calls
dma-mapping: move the remaining DMA API calls out of line
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 10862c5a8c76..9c5f06e8eb9b 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -7,6 +7,7 @@ config ALPHA select ARCH_NO_PREEMPT select ARCH_NO_SG_CHAIN select ARCH_USE_CMPXCHG_LOCKREF + select DMA_OPS if PCI select FORCE_PCI if !ALPHA_JENSEN select PCI_DOMAINS if PCI select PCI_SYSCALL if PCI |