lkml.org 
[lkml]   [2008]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/20] x86: move dma_cache_sync to common header
    Date
    they are the same in both architectures.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    include/asm-x86/dma-mapping.h | 6 ++++++
    include/asm-x86/dma-mapping_32.h | 7 -------
    include/asm-x86/dma-mapping_64.h | 7 -------
    3 files changed, 6 insertions(+), 14 deletions(-)

    diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
    index b5a413a..70a5ede 100644
    --- a/include/asm-x86/dma-mapping.h
    +++ b/include/asm-x86/dma-mapping.h
    @@ -183,4 +183,10 @@ static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
    dma_unmap_single(dev, addr, size, direction);
    }

    +static inline void
    +dma_cache_sync(struct device *dev, void *vaddr, size_t size,
    + enum dma_data_direction dir)
    +{
    + flush_write_buffers();
    +}
    #endif
    diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h
    index c61ae7f..e60c30a 100644
    --- a/include/asm-x86/dma-mapping_32.h
    +++ b/include/asm-x86/dma-mapping_32.h
    @@ -55,13 +55,6 @@ dma_get_cache_alignment(void)

    #define dma_is_consistent(d, h) (1)

    -static inline void
    -dma_cache_sync(struct device *dev, void *vaddr, size_t size,
    - enum dma_data_direction direction)
    -{
    - flush_write_buffers();
    -}
    -
    #define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
    extern int
    dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
    diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h
    index 2b4a430..b1bc6ca 100644
    --- a/include/asm-x86/dma-mapping_64.h
    +++ b/include/asm-x86/dma-mapping_64.h
    @@ -24,13 +24,6 @@ static inline int dma_get_cache_alignment(void)

    extern int dma_set_mask(struct device *dev, u64 mask);

    -static inline void
    -dma_cache_sync(struct device *dev, void *vaddr, size_t size,
    - enum dma_data_direction dir)
    -{
    - flush_write_buffers();
    -}
    -
    extern struct device fallback_dev;
    extern int panic_on_overflow;

    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-25 22:45    [W:0.025 / U:1.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site