socsvn commit: r241180 - in soc2012/aleek/beaglexm-armv6/sys/arm: arm include

[aleek at FreeBSD.org]

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)