lkml.org 
[lkml]   [2019]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 11/11] arm64: use asm-generic/dma-mapping.h
    On Mon, 26 Aug 2019, Christoph Hellwig wrote:
    > Now that the Xen special cases are gone nothing worth mentioning is
    > left in the arm64 <asm/dma-mapping.h> file, so switch to use the
    > asm-generic version instead.
    >
    > Signed-off-by: Christoph Hellwig <hch@lst.de>
    > Acked-by: Will Deacon <will@kernel.org>

    Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


    > ---
    > arch/arm64/include/asm/Kbuild | 1 +
    > arch/arm64/include/asm/dma-mapping.h | 22 ----------------------
    > arch/arm64/mm/dma-mapping.c | 1 +
    > 3 files changed, 2 insertions(+), 22 deletions(-)
    > delete mode 100644 arch/arm64/include/asm/dma-mapping.h
    >
    > diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
    > index c52e151afab0..98a5405c8558 100644
    > --- a/arch/arm64/include/asm/Kbuild
    > +++ b/arch/arm64/include/asm/Kbuild
    > @@ -4,6 +4,7 @@ generic-y += delay.h
    > generic-y += div64.h
    > generic-y += dma.h
    > generic-y += dma-contiguous.h
    > +generic-y += dma-mapping.h
    > generic-y += early_ioremap.h
    > generic-y += emergency-restart.h
    > generic-y += hw_irq.h
    > diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
    > deleted file mode 100644
    > index 67243255a858..000000000000
    > --- a/arch/arm64/include/asm/dma-mapping.h
    > +++ /dev/null
    > @@ -1,22 +0,0 @@
    > -/* SPDX-License-Identifier: GPL-2.0-only */
    > -/*
    > - * Copyright (C) 2012 ARM Ltd.
    > - */
    > -#ifndef __ASM_DMA_MAPPING_H
    > -#define __ASM_DMA_MAPPING_H
    > -
    > -#ifdef __KERNEL__
    > -
    > -#include <linux/types.h>
    > -#include <linux/vmalloc.h>
    > -
    > -#include <xen/xen.h>
    > -#include <asm/xen/hypervisor.h>
    > -
    > -static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
    > -{
    > - return NULL;
    > -}
    > -
    > -#endif /* __KERNEL__ */
    > -#endif /* __ASM_DMA_MAPPING_H */
    > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
    > index 4b244a037349..6578abcfbbc7 100644
    > --- a/arch/arm64/mm/dma-mapping.c
    > +++ b/arch/arm64/mm/dma-mapping.c
    > @@ -8,6 +8,7 @@
    > #include <linux/cache.h>
    > #include <linux/dma-noncoherent.h>
    > #include <linux/dma-iommu.h>
    > +#include <xen/xen.h>
    > #include <xen/swiotlb-xen.h>
    >
    > #include <asm/cacheflush.h>
    > --
    > 2.20.1
    >

    \
     
     \ /
      Last update: 2019-08-30 00:49    [W:4.256 / U:1.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site