On Mon, 1 Feb 2016 10:00:53 -0800 Andy Lutomirski <l...@kernel.org> wrote:
> From: Christian Borntraeger <borntrae...@de.ibm.com> > > As virtio-ccw will have dma ops, we can no longer default to the > zPCI ones. Make use of dev_archdata to keep the dma_ops per device. > The pci devices now use that to override the default, and the > default is changed to use the noop ops for everything that does not > specify a device specific one. > To compile without PCI support we will enable HAS_DMA all the time, > via the default config in lib/Kconfig. > > Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> > Reviewed-by: Joerg Roedel <jroe...@suse.de> > Acked-by: Sebastian Ott <seb...@linux.vnet.ibm.com> > --- > arch/s390/Kconfig | 6 ++---- > arch/s390/include/asm/device.h | 6 +++++- > arch/s390/include/asm/dma-mapping.h | 6 ++++-- > arch/s390/pci/pci.c | 1 + > arch/s390/pci/pci_dma.c | 4 ++-- > 5 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index 3be9c832dec1..5b22a26337b2 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -124,6 +124,8 @@ config S390 > select HAVE_CMPXCHG_DOUBLE > select HAVE_CMPXCHG_LOCAL > select HAVE_DEBUG_KMEMLEAK > + select HAVE_DMA_ATTRS HAVE_DMA_ATTRS no longer exists in the current tree. > + select HAVE_DMA_API_DEBUG > select HAVE_DYNAMIC_FTRACE > select HAVE_DYNAMIC_FTRACE_WITH_REGS > select HAVE_FTRACE_MCOUNT_RECORD With the line above removed: Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com> _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
