Module Name: src
Committed By: matt
Date: Tue Nov 17 07:56:27 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]:
bus_space_alignstride_chipdep.c
Log Message:
Appease the extent routines and pass a u_long instead of a bus_addr_t.
(slightly bogus but then we really should kill extent and switch to vmem)
To generate a diff of this commit:
cvs rdiff -u -r1.10.18.6 -r1.10.18.7 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.6 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.7
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.6 Tue Nov 17 07:35:24 2009
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Tue Nov 17 07:56:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.6 2009/11/17 07:35:24 matt Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.7 2009/11/17 07:56:27 matt Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.6 2009/11/17 07:35:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.7 2009/11/17 07:56:27 matt Exp $");
#ifdef CHIP_EXTENT
#include <sys/extent.h>
@@ -875,7 +875,7 @@
{
#ifdef CHIP_EXTENT
struct mips_bus_space_translation mbst;
- bus_addr_t addr;
+ u_long addr; /* bogus but makes extent happy */
int error;
#if CHIP_ALIGN_STRIDE != 0
int linear = flags & BUS_SPACE_MAP_LINEAR;
