From cfa4fa33706521379e50777d0783ae5d4f9e283b Mon Sep 17 00:00:00 2001 From: mmel Date: Sat, 15 Oct 2016 08:31:46 +0000 Subject: MFC r306759: ARM: Remove ARMv4 #defines from busdma_machdep-v6.c, it's ARMv6 specific file. Consistently use BUSDMA_DCACHE_ALIGN for cache line alignment. --- sys/arm/arm/busdma_machdep-v6.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c index fe446b9..0a1331f 100644 --- a/sys/arm/arm/busdma_machdep-v6.c +++ b/sys/arm/arm/busdma_machdep-v6.c @@ -61,13 +61,8 @@ __FBSDID("$FreeBSD$"); #include #include -#if __ARM_ARCH < 6 -#define BUSDMA_DCACHE_ALIGN arm_dcache_align -#define BUSDMA_DCACHE_MASK arm_dcache_align_mask -#else #define BUSDMA_DCACHE_ALIGN cpuinfo.dcache_line_size #define BUSDMA_DCACHE_MASK cpuinfo.dcache_line_mask -#endif #define MAX_BPAGES 64 #define MAX_DMA_SEGMENTS 4096 @@ -340,7 +335,7 @@ cacheline_bounce(bus_dmamap_t map, bus_addr_t addr, bus_size_t size) if (map->flags & (DMAMAP_DMAMEM_ALLOC | DMAMAP_COHERENT | DMAMAP_MBUF)) return (0); - return ((addr | size) & arm_dcache_align_mask); + return ((addr | size) & BUSDMA_DCACHE_MASK); } /* -- cgit v1.1