[src/matt-nb6-plus]: src/sys/arch/arm/include Pullup from HEAD:

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8306254e0f76
branches:  matt-nb6-plus
changeset: 774536:8306254e0f76
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jan 17 01:33:34 2013 +0000

description:
Pullup from HEAD:
Cortex needs ._dmamap_sync_post for BUS_DMASYNC_POSTREAD

diffstat:

 sys/arch/arm/include/bus_funcs.h |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r d1811cf83bb1 -r 8306254e0f76 sys/arch/arm/include/bus_funcs.h
--- a/sys/arch/arm/include/bus_funcs.h  Wed Jan 16 22:44:18 2013 +0000
+++ b/sys/arch/arm/include/bus_funcs.h  Thu Jan 17 01:33:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_funcs.h,v 1.1.10.1 2012/11/28 22:40:28 matt Exp $  */
+/*     $NetBSD: bus_funcs.h,v 1.1.10.2 2013/01/17 01:33:34 matt Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -64,6 +64,10 @@
 #ifndef _ARM32_BUS_FUNCS_H_
 #define _ARM32_BUS_FUNCS_H_
 
+#ifdef _KERNEL_OPT
+#include "opt_cputypes.h"
+#endif
+
 /*
  * Utility macros; INTERNAL USE ONLY.
  */
@@ -635,7 +639,7 @@
 void   _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
            bus_size_t, int);
 
-#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
+#if defined(_ARM32_NEED_BUS_DMA_BOUNCE) || defined(CPU_CORTEX)
 #define        _BUS_DMAMAP_SYNC_FUNCS \
        ._dmamap_sync_pre = _bus_dmamap_sync,   \
        ._dmamap_sync_post = _bus_dmamap_sync