lkml.org 
[lkml]   [2010]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 15/20] ARM: LPAE: Use generic dma_addr_t type definition
    Date
    From: Will Deacon <will.deacon@arm.com>

    This patch uses the types.h implementation in asm-generic to define the
    dma_addr_t type as the same width as phys_addr_t.

    NOTE: this is a temporary patch until the corresponding patches unifying
    the dma_addr_t and removing the dma64_addr_t are merged into mainline.

    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    ---
    arch/arm/include/asm/types.h | 20 +-------------------
    1 files changed, 1 insertions(+), 19 deletions(-)

    diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
    index 345df01..dc1bdbb 100644
    --- a/arch/arm/include/asm/types.h
    +++ b/arch/arm/include/asm/types.h
    @@ -1,30 +1,12 @@
    #ifndef __ASM_ARM_TYPES_H
    #define __ASM_ARM_TYPES_H

    -#include <asm-generic/int-ll64.h>
    +#include <asm-generic/types.h>

    -#ifndef __ASSEMBLY__
    -
    -typedef unsigned short umode_t;
    -
    -#endif /* __ASSEMBLY__ */
    -
    -/*
    - * These aren't exported outside the kernel to avoid name space clashes
    - */
    #ifdef __KERNEL__

    #define BITS_PER_LONG 32

    -#ifndef __ASSEMBLY__
    -
    -/* Dma addresses are 32-bits wide. */
    -
    -typedef u32 dma_addr_t;
    -typedef u32 dma64_addr_t;
    -
    -#endif /* __ASSEMBLY__ */
    -
    #endif /* __KERNEL__ */

    #endif

    \
     
     \ /
      Last update: 2010-11-12 19:03    [W:0.021 / U:178.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site