[src/trunk]: src/sys/dev/isa Patch out the 'struct malloc_type' from the isa_...

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

details:   https://anonhg.NetBSD.org/src/rev/235a0896d2ab
branches:  trunk
changeset: 779066:235a0896d2ab
user:      dsl <dsl%NetBSD.org@localhost>
date:      Sun Apr 29 21:13:56 2012 +0000

description:
Patch out the 'struct malloc_type' from the isa_dma alloc routines.
All the i386 kernels now build

diffstat:

 sys/dev/isa/isadmavar.h |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r d1ad4873d54a -r 235a0896d2ab sys/dev/isa/isadmavar.h
--- a/sys/dev/isa/isadmavar.h   Sun Apr 29 20:27:31 2012 +0000
+++ b/sys/dev/isa/isadmavar.h   Sun Apr 29 21:13:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isadmavar.h,v 1.25 2009/08/18 16:52:42 dyoung Exp $    */
+/*     $NetBSD: isadmavar.h,v 1.26 2012/04/29 21:13:56 dsl Exp $       */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -92,7 +92,6 @@
 
 #ifdef _KERNEL
 struct proc;
-struct malloc_type;
 
 void      _isa_dmainit(struct isa_dma_state *, bus_space_tag_t,
               bus_dma_tag_t, device_t);
@@ -132,6 +131,10 @@
 int       _isa_drq_free(struct isa_dma_state *, int);
 int       _isa_drq_isfree(struct isa_dma_state *, int);
 
+#define _isa_malloc(dma_state, c, s, p, f) \
+    _isa_malloc(dma_state, c, s, f)
+#define _isa_free(v, p) _isa_free(v)
+
 void      *_isa_malloc(struct isa_dma_state *, int, size_t,
                struct malloc_type *, int);
 void      _isa_free(void *, struct malloc_type *);