From 90114d65feea716eeae0ab51e92c95b140b2e6fc Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Mon, 25 Aug 2014 13:02:52 +0200 Subject: 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 Acked-By: Sebastian Ott Signed-off-by: Marek Szyprowski --- arch/s390/Kconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/s390/Kconfig') 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 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 -- cgit v1.2.3-70-g09d2