From owner-svn-src-stable@freebsd.org  Sat Oct 15 08:31:48 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44F15C11A17;
 Sat, 15 Oct 2016 08:31:48 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1375AAB7;
 Sat, 15 Oct 2016 08:31:48 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9F8Vloh039572;
 Sat, 15 Oct 2016 08:31:47 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9F8VlAm039571;
 Sat, 15 Oct 2016 08:31:47 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201610150831.u9F8VlAm039571@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Sat, 15 Oct 2016 08:31:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r307345 - stable/11/sys/arm/arm
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Oct 2016 08:31:48 -0000

Author: mmel
Date: Sat Oct 15 08:31:46 2016
New Revision: 307345
URL: https://svnweb.freebsd.org/changeset/base/307345

Log:
  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.

Modified:
  stable/11/sys/arm/arm/busdma_machdep-v6.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- stable/11/sys/arm/arm/busdma_machdep-v6.c	Sat Oct 15 08:27:54 2016	(r307344)
+++ stable/11/sys/arm/arm/busdma_machdep-v6.c	Sat Oct 15 08:31:46 2016	(r307345)
@@ -61,13 +61,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu-v6.h>
 #include <machine/md_var.h>
 
-#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_a
 
 	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);
 }
 
 /*