[PATCH 2/6] ARM: move ARCH_HAS_DMA_SET_COHERENT_MASK into memory.h
From: Rob Herring <hidden>
Date: 2011-07-09 14:33:12
Also in:
lkml
Nicolas, On 06/29/2011 11:46 AM, Rob Herring wrote:
quoted hunk ↗ jump to hunk
From: Rob Herring <redacted> On ixp4xx and pxa, ARCH_HAS_DMA_SET_COHERENT_MASK resides in hardware.h which does not get directly included by dma-mapping.h. Move it into mach/memory.h which is explicitly included. Signed-off-by: Rob Herring <redacted> --- arch/arm/mach-ixp4xx/include/mach/hardware.h | 2 -- arch/arm/mach-ixp4xx/include/mach/memory.h | 1 + arch/arm/mach-pxa/include/mach/hardware.h | 1 - arch/arm/mach-pxa/include/mach/memory.h | 1 + 4 files changed, 2 insertions(+), 3 deletions(-)diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index 8138371..f91ca6d 100644 --- a/arch/arm/mach-ixp4xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h@@ -26,8 +26,6 @@ #define PCIBIOS_MAX_MEM 0x4BFFFFFF #endif -#define ARCH_HAS_DMA_SET_COHERENT_MASK - #define pcibios_assign_all_busses() 1 /* Register locations and bits */diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h index 34e7940..d671f5c 100644 --- a/arch/arm/mach-ixp4xx/include/mach/memory.h +++ b/arch/arm/mach-ixp4xx/include/mach/memory.h@@ -16,6 +16,7 @@ #ifdef CONFIG_PCI #define ARM_DMA_ZONE_SIZE SZ_64M +#define ARCH_HAS_DMA_SET_COHERENT_MASK #endif #endifdiff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 6957ba5..313051c 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h@@ -340,7 +340,6 @@ extern unsigned long get_clock_tick_rate(void); #define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_MEM 0 #define pcibios_assign_all_busses() 1 -#define ARCH_HAS_DMA_SET_COHERENT_MASK #endif #endif /* _ASM_ARCH_HARDWARE_H */diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index 07734f3..e697578 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h@@ -19,6 +19,7 @@ #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) #define ARM_DMA_ZONE_SIZE SZ_64M +#define ARCH_HAS_DMA_SET_COHERENT_MASK #endif #endif
I noticed this is going to have conflicts with your ARM_DMA_ZONE_SIZE series. Can you add this into your series? This still presents another issue to solve for single kernel binary, but hopefully the dma mapping work will help. Rob