Module Name: src
Committed By: dsl
Date: Sun Apr 29 21:13:56 UTC 2012
Modified Files:
src/sys/dev/isa: isadmavar.h
Log Message:
Patch out the 'struct malloc_type' from the isa_dma alloc routines.
All the i386 kernels now build
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/isa/isadmavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/isadmavar.h
diff -u src/sys/dev/isa/isadmavar.h:1.25 src/sys/dev/isa/isadmavar.h:1.26
--- src/sys/dev/isa/isadmavar.h:1.25 Tue Aug 18 16:52:42 2009
+++ src/sys/dev/isa/isadmavar.h Sun Apr 29 21:13:56 2012
@@ -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 @@ struct isa_mem {
#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_alloc(struct isa_dma_sta
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 *);
