lkml.org 
[lkml]   [2010]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 02/12] x86: use asm-generic/pci-dma-common.h
    Date
    From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: x86@kernel.org
    ---
    arch/x86/include/asm/pci.h | 27 ++-------------------------
    1 files changed, 2 insertions(+), 25 deletions(-)

    diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
    index ada8c20..441e94a 100644
    --- a/arch/x86/include/asm/pci.h
    +++ b/arch/x86/include/asm/pci.h
    @@ -91,32 +91,9 @@ extern void pci_iommu_alloc(void);
    #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)

    #if defined(CONFIG_X86_64) || defined(CONFIG_DMAR) || defined(CONFIG_DMA_API_DEBUG)
    -
    -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
    - dma_addr_t ADDR_NAME;
    -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \
    - __u32 LEN_NAME;
    -#define pci_unmap_addr(PTR, ADDR_NAME) \
    - ((PTR)->ADDR_NAME)
    -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
    - (((PTR)->ADDR_NAME) = (VAL))
    -#define pci_unmap_len(PTR, LEN_NAME) \
    - ((PTR)->LEN_NAME)
    -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
    - (((PTR)->LEN_NAME) = (VAL))
    -
    -#else
    -
    -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME[0];
    -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
    -#define pci_unmap_addr(PTR, ADDR_NAME) sizeof((PTR)->ADDR_NAME)
    -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
    - do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
    -#define pci_unmap_len(PTR, LEN_NAME) sizeof((PTR)->LEN_NAME)
    -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
    - do { break; } while (pci_unmap_len(PTR, LEN_NAME))
    -
    +#define HAVE_ARCH_PCI_UNMAP
    #endif
    +#include <asm-generic/pci-dma-common.h>

    #endif /* __KERNEL__ */

    --
    1.5.6.5


    \
     
     \ /
      Last update: 2010-02-09 15:17    [W:2.264 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site