From owner-svn-soc-all@FreeBSD.ORG  Sun Sep  2 15:48:07 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 476BE106566C
	for <svn-soc-all@FreeBSD.org>; Sun,  2 Sep 2012 15:48:05 +0000 (UTC)
	(envelope-from aleek@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 02 Sep 2012 15:48:05 +0000
Date: Sun, 02 Sep 2012 15:48:05 +0000
From: aleek@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120902154805.476BE106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r241180 - in soc2012/aleek/beaglexm-armv6/sys/arm:
	arm include
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Sep 2012 15:48:07 -0000

Author: aleek
Date: Sun Sep  2 15:48:04 2012
New Revision: 241180
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=241180

Log:
  applied gonzo-'s patch for external non-linefetch abort

Modified:
  soc2012/aleek/beaglexm-armv6/sys/arm/arm/busdma_machdep-v6.c
  soc2012/aleek/beaglexm-armv6/sys/arm/include/atomic.h

Modified: soc2012/aleek/beaglexm-armv6/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/arm/busdma_machdep-v6.c	Sun Sep  2 15:29:37 2012	(r241179)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/arm/busdma_machdep-v6.c	Sun Sep  2 15:48:04 2012	(r241180)
@@ -618,10 +618,6 @@
 	}
 	dmat->map_count++;
 
-	if (flags & BUS_DMA_COHERENT)
-		pmap_change_attr((vm_offset_t)*vaddr, len,
-		    BUS_DMA_NOCACHE);
-
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->flags, 0);
 	return (0);

Modified: soc2012/aleek/beaglexm-armv6/sys/arm/include/atomic.h
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/include/atomic.h	Sun Sep  2 15:29:37 2012	(r241179)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/include/atomic.h	Sun Sep  2 15:48:04 2012	(r241180)
@@ -59,8 +59,8 @@
 #endif
 
 /* XXX: Rethink for userland later as those won't be defined */
-//#if ARM_ARCH_6 || ARM_ARCH_7A
-#if 0
+#if ARM_ARCH_6 || ARM_ARCH_7A
+//#if 0
 
 static __inline void
 __do_dmb(void)