diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-18 23:00:42 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-18 23:00:42 +0100 |
| commit | 07f1c295de593ec0b0dca3092299c048c03374da (patch) | |
| tree | ad8f291e550b3315f84c07e9f543e25adcf95dc3 /arch/arm/include/asm/memory.h | |
| parent | 4aa96ccf9ee35cdbd0d423e87a4d551019570218 (diff) | |
| parent | fb89fcfb151698776be6c900aec8161b01990e92 (diff) | |
Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/include/asm/memory.h')
| -rw-r--r-- | arch/arm/include/asm/memory.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index af44a8fb348..b8de516e600 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -204,18 +204,6 @@ static inline unsigned long __phys_to_virt(unsigned long x) #endif /* - * The DMA mask corresponding to the maximum bus address allocatable - * using GFP_DMA. The default here places no restriction on DMA - * allocations. This must be the smallest DMA mask in the system, - * so a successful GFP_DMA allocation will always satisfy this. - */ -#ifndef ARM_DMA_ZONE_SIZE -#define ISA_DMA_THRESHOLD (0xffffffffULL) -#else -#define ISA_DMA_THRESHOLD (PHYS_OFFSET + ARM_DMA_ZONE_SIZE - 1) -#endif - -/* * PFNs are used to describe any physical page; this means * PFN 0 == physical address 0. * |