diff options
author | Thierry Reding <treding@nvidia.com> | 2014-08-25 07:02:52 -0400 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-08-26 01:39:12 -0400 |
commit | 90114d65feea716eeae0ab51e92c95b140b2e6fc (patch) | |
tree | 72d7ce0a1cf61c34a3122b77ea914dad50cff68b /arch/s390/Kconfig | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) |
s390: Implement dma_{alloc,free}_attrs()
The S390 architecture advertises support for HAVE_DMA_ATTRS when PCI is
enabled. Patches to unify some of the DMA API would like to rely on the
dma_alloc_attrs() and dma_free_attrs() functions to be provided when an
architecture supports DMA attributes.
Rename dma_alloc_coherent() and dma_free_coherent() to dma_alloc_attrs()
and dma_free_attrs() since they are functionally equivalent and alias
the former to the latter for compatibility.
For consistency with other architectures, also reuse the existing symbol
HAVE_DMA_ATTRS defined in arch/Kconfig instead of providing a duplicate.
Select it when PCI is enabled.
While at it, drop a redundant 'default n' from the PCI Kconfig symbol.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-By: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index ab39ceb89ecf..fafeae01725a 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -498,8 +498,8 @@ config QDIO | |||
498 | 498 | ||
499 | menuconfig PCI | 499 | menuconfig PCI |
500 | bool "PCI support" | 500 | bool "PCI support" |
501 | default n | ||
502 | depends on 64BIT | 501 | depends on 64BIT |
502 | select HAVE_DMA_ATTRS | ||
503 | select PCI_MSI | 503 | select PCI_MSI |
504 | help | 504 | help |
505 | Enable PCI support. | 505 | Enable PCI support. |
@@ -546,9 +546,6 @@ config HAS_DMA | |||
546 | config NEED_SG_DMA_LENGTH | 546 | config NEED_SG_DMA_LENGTH |
547 | def_bool PCI | 547 | def_bool PCI |
548 | 548 | ||
549 | config HAVE_DMA_ATTRS | ||
550 | def_bool PCI | ||
551 | |||
552 | config NEED_DMA_MAP_STATE | 549 | config NEED_DMA_MAP_STATE |
553 | def_bool PCI | 550 | def_bool PCI |
554 | 551 | ||