diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 15:39:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 08:36:53 +0100 |
| commit | be20902ba67de70b38c995903321f4152dee57b7 (patch) | |
| tree | 86f27d4d90b7408d421ce246527431e58a836bf3 /arch/arm/mach-pxa/include/mach/memory.h | |
| parent | ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS (diff) | |
| download | linux-dev-be20902ba67de70b38c995903321f4152dee57b7.tar.xz linux-dev-be20902ba67de70b38c995903321f4152dee57b7.zip | |
ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes
Rather than each platform providing its own function to adjust the
zone sizes, use the new ARM_DMA_ZONE_SIZE definition to perform this
adjustment. This ensures that the actual DMA zone size and the
ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS definitions are consistent with
each other, and moves this complexity out of the platform code.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index 57a0b689b4d0..07734f37f8fd 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h @@ -17,12 +17,7 @@ */ #define PLAT_PHYS_OFFSET UL(0xa0000000) -#if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) -void cmx2xx_pci_adjust_zones(unsigned long *size, unsigned long *holes); - -#define arch_adjust_zones(size, holes) \ - cmx2xx_pci_adjust_zones(size, holes) - +#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) #define ARM_DMA_ZONE_SIZE SZ_64M #endif |