summaryrefslogtreecommitdiffstats
path: root/arch/s390/Kconfig
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-08-25 13:02:52 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-08-26 07:39:12 +0200
commit90114d65feea716eeae0ab51e92c95b140b2e6fc (patch)
tree72d7ce0a1cf61c34a3122b77ea914dad50cff68b /arch/s390/Kconfig
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
downloadop-kernel-dev-90114d65feea716eeae0ab51e92c95b140b2e6fc.zip
op-kernel-dev-90114d65feea716eeae0ab51e92c95b140b2e6fc.tar.gz
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/Kconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ab39ceb8..fafeae0 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -498,8 +498,8 @@ config QDIO
menuconfig PCI
bool "PCI support"
- default n
depends on 64BIT
+ select HAVE_DMA_ATTRS
select PCI_MSI
help
Enable PCI support.
@@ -546,9 +546,6 @@ config HAS_DMA
config NEED_SG_DMA_LENGTH
def_bool PCI
-config HAVE_DMA_ATTRS
- def_bool PCI
-
config NEED_DMA_MAP_STATE
def_bool PCI
OpenPOWER on IntegriCloud