Module Name: src
Committed By: matt
Date: Mon Feb 18 16:03:25 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Disable when using extended MMU support.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.79 src/sys/arch/arm/arm32/bus_dma.c:1.80
--- src/sys/arch/arm/arm32/bus_dma.c:1.79 Sat Feb 16 06:49:43 2013
+++ src/sys/arch/arm/arm32/bus_dma.c Mon Feb 18 16:03:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.79 2013/02/16 06:49:43 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.80 2013/02/18 16:03:25 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.79 2013/02/16 06:49:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.80 2013/02/18 16:03:25 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1064,6 +1064,7 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
}
#endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
+#ifndef ARM_MMU_EXTENDED
/*
* If the mapping belongs to a non-kernel vmspace, and the
* vmspace has not been active since the last time a full
@@ -1072,6 +1073,7 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
if (__predict_false(!VMSPACE_IS_KERNEL_P(map->_dm_vmspace) &&
vm_map_pmap(&map->_dm_vmspace->vm_map)->pm_cstate.cs_cache_d == 0))
return;
+#endif
int buftype = map->_dm_buftype;
#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
